mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-12-01 20:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CUDA 9 build #910

Browse Source
This commit is contained in:
Christophe Riccio 2019-09-07 14:32:06 +02:00
parent 7565378ef7
commit 943529eef6
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glm/gtx/fast_square_root.inl
View File

@ -21,12 +21,7 @@ namespace glm
template<typename genType> template<typename genType>
GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x) GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x)
{ {
# ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6 return detail::compute_inversesqrt<1, genType, lowp, detail::is_aligned<lowp>::value>::call(vec<1, genType, lowp>(x)).x;
vec<1, T, Q> tmp(detail::compute_inversesqrt<tvec1, genType, lowp, detail::is_aligned<lowp>::value>::call(vec<1, genType, lowp>(x)));
return tmp.x;
# else
return detail::compute_inversesqrt<1, genType, lowp, detail::is_aligned<lowp>::value>::call(vec<1, genType, lowp>(x)).x;
# endif
} }
template<length_t L, typename T, qualifier Q> template<length_t L, typename T, qualifier Q>

5
glm/simd/platform.h
View File

@ -77,9 +77,8 @@
// CUDA // CUDA
#define GLM_COMPILER_CUDA 0x10000000 #define GLM_COMPILER_CUDA 0x10000000
#define GLM_COMPILER_CUDA70 0x100000A0 #define GLM_COMPILER_CUDA80 0x100000A0
#define GLM_COMPILER_CUDA75 0x100000B0 #define GLM_COMPILER_CUDA90 0x100000B0
#define GLM_COMPILER_CUDA80 0x100000C0
// SYCL // SYCL
#define GLM_COMPILER_SYCL 0x00300000 #define GLM_COMPILER_SYCL 0x00300000

5
readme.md
View File

@ -14,7 +14,7 @@ This library works perfectly with *[OpenGL](https://www.opengl.org)* but it also
- [Intel C++ Composer](https://software.intel.com/en-us/intel-compilers) XE 2013 and higher - [Intel C++ Composer](https://software.intel.com/en-us/intel-compilers) XE 2013 and higher
- [LLVM](http://llvm.org/) 3.4 and higher - [LLVM](http://llvm.org/) 3.4 and higher
- [Visual C++](http://www.visualstudio.com/) 2013 and higher - [Visual C++](http://www.visualstudio.com/) 2013 and higher
- [CUDA](https://developer.nvidia.com/about-cuda) 7.0 and higher (experimental) - [CUDA](https://developer.nvidia.com/about-cuda) 9.0 and higher (experimental)
- [SYCL](https://www.khronos.org/sycl/) (experimental: only [ComputeCpp](https://codeplay.com/products/computesuite/computecpp) implementation has been tested). - [SYCL](https://www.khronos.org/sycl/) (experimental: only [ComputeCpp](https://codeplay.com/products/computesuite/computecpp) implementation has been tested).
- Any C++11 compiler - Any C++11 compiler
@ -56,11 +56,11 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
### [GLM 0.9.9.6](https://github.com/g-truc/glm/tree/master) ### [GLM 0.9.9.6](https://github.com/g-truc/glm/tree/master)
#### Features: #### Features:
- Added Neon support to glm #945 - Added Neon support to glm #945
- Added SYCL support #914
- Added EXT_scalar_integer extension with power of two and multiple scalar functions - Added EXT_scalar_integer extension with power of two and multiple scalar functions
- Added EXT_vector_integer extension with power of two and multiple vector functions - Added EXT_vector_integer extension with power of two and multiple vector functions
#### Improvements: #### Improvements:
- Added SYCL support #914
- Added Visual C++ 2019 detection - Added Visual C++ 2019 detection
- Added Visual C++ 2017 15.8 and 15.9 detection - Added Visual C++ 2017 15.8 and 15.9 detection
@ -74,6 +74,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
- Fixed quaternion componant order: w, {x, y, z} #916 - Fixed quaternion componant order: w, {x, y, z} #916
- Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926 - Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926
- Fixed Clang or GCC build due to wrong GLM_HAS_IF_CONSTEXPR definition #907 - Fixed Clang or GCC build due to wrong GLM_HAS_IF_CONSTEXPR definition #907
- Fixed CUDA 9 build #910
#### Deprecation: #### Deprecation:
- Removed CMake install and uninstall scripts - Removed CMake install and uninstall scripts