mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-09-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed isnan on CUDA #727

Browse Source
This commit is contained in:
Christophe Riccio 2018-05-07 18:21:48 +02:00
parent b3a24a0565
commit 62dfe7adfb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/func_common.inl
View File

@ -640,7 +640,7 @@ namespace detail
# elif (GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) && (GLM_PLATFORM & GLM_PLATFORM_ANDROID) && __cplusplus < 201103L # elif (GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) && (GLM_PLATFORM & GLM_PLATFORM_ANDROID) && __cplusplus < 201103L
return _isnan(x) != 0; return _isnan(x) != 0;
# elif GLM_COMPILER & GLM_COMPILER_CUDA # elif GLM_COMPILER & GLM_COMPILER_CUDA
return isnan(x) != 0; return ::isnan(x) != 0;
# else # else
return std::isnan(x); return std::isnan(x);
# endif # endif
@ -682,7 +682,7 @@ namespace detail
# endif # endif
# elif GLM_COMPILER & GLM_COMPILER_CUDA # elif GLM_COMPILER & GLM_COMPILER_CUDA
// http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/docs/online/group__CUDA__MATH__DOUBLE_g13431dd2b40b51f9139cbb7f50c18fab.html#g13431dd2b40b51f9139cbb7f50c18fab // http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/docs/online/group__CUDA__MATH__DOUBLE_g13431dd2b40b51f9139cbb7f50c18fab.html#g13431dd2b40b51f9139cbb7f50c18fab
return isinf(double(x)) != 0; return ::isinf(double(x)) != 0;
# else # else
return std::isinf(x); return std::isinf(x);
# endif # endif

1
readme.md
View File

@ -110,6 +110,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
- Fixed quaternion constructor from two vectors special cases #469 - Fixed quaternion constructor from two vectors special cases #469
- Fixed glm::to_string on quaternions wrong components order #681 - Fixed glm::to_string on quaternions wrong components order #681
- Fixed acsch #698 - Fixed acsch #698
- Fixed isnan on CUDA #727
#### Deprecation: #### Deprecation:
- Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler