mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed CUDA warnings and errors, #43

Browse Source
This commit is contained in:
Christophe Riccio
2013-02-14 01:08:24 +01:00
parent fc77c7a54e
commit 0df4b94c4b
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glm/core/func_geometric.inl
View File

@@ -132,7 +132,6 @@ namespace glm
( (
genType const & x, genType const & x,
genType const & y genType const & y
) )
{ {
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'dot' only accept floating-point inputs"); GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'dot' only accept floating-point inputs");
@@ -271,7 +270,7 @@ namespace glm
// reflect // reflect
template <typename genType> template <typename genType>
genType reflect GLM_FUNC_QUALIFIER genType reflect
( (
genType const & I, genType const & I,
genType const & N genType const & N

30
glm/core/type_half.hpp
View File

@@ -36,8 +36,8 @@ namespace detail
{ {
typedef short hdata; typedef short hdata;
float toFloat32(hdata value); GLM_FUNC_DECL float toFloat32(hdata value);
hdata toFloat16(float const & value); GLM_FUNC_DECL hdata toFloat16(float const & value);
class half class half
{ {
@@ -71,42 +71,42 @@ namespace detail
hdata data; hdata data;
}; };
half operator+ (half const & s1, half const & s2); GLM_FUNC_DECL half operator+ (half const & s1, half const & s2);
half operator- (half const & s1, half const & s2); GLM_FUNC_DECL half operator- (half const & s1, half const & s2);
half operator* (half const & s1, half const & s2); GLM_FUNC_DECL half operator* (half const & s1, half const & s2);
half operator/ (half const & s1, half const & s2); GLM_FUNC_DECL half operator/ (half const & s1, half const & s2);
// Unary constant operators // Unary constant operators
half operator- (half const & s); GLM_FUNC_DECL half operator- (half const & s);
half operator-- (half const & s, int); GLM_FUNC_DECL half operator-- (half const & s, int);
half operator++ (half const & s, int); GLM_FUNC_DECL half operator++ (half const & s, int);
bool operator==( GLM_FUNC_DECL bool operator==(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);
bool operator!=( GLM_FUNC_DECL bool operator!=(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);
bool operator<( GLM_FUNC_DECL bool operator<(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);
bool operator<=( GLM_FUNC_DECL bool operator<=(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);
bool operator>( GLM_FUNC_DECL bool operator>(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);
bool operator>=( GLM_FUNC_DECL bool operator>=(
detail::half const & x, detail::half const & x,
detail::half const & y); detail::half const & y);

1
readme.txt
View File

@@ -49,6 +49,7 @@ GLM 0.9.4.2: 2013-02-14
- Fixed 0x2013 dash character in comments that cause issue in Windows - Fixed 0x2013 dash character in comments that cause issue in Windows
Japanese mode Japanese mode
- Fixed documentation warnings - Fixed documentation warnings
- Fixed CUDA warnings
================================================================================ ================================================================================
GLM 0.9.4.1: 2012-12-22 GLM 0.9.4.1: 2012-12-22