anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Merge pull request #1073 from Robadob/nvrtc_support

Browse Source 
Correctly detect NVRTC and lack of stl support #1073
master
Christophe ago%!(EXTRA string=4 years) committed by GitHub
parent 4abd46483a 948ac3b825
commit c6dfaed4a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      glm/detail/setup.hpp
  2. 5
      glm/simd/platform.h

2
glm/detail/setup.hpp
Unescape View File

@ -142,6 +142,8 @@
// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564 // Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED) #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
# define GLM_HAS_CXX11_STL 0 # define GLM_HAS_CXX11_STL 0
#elif GLM_COMPILER & GLM_COMPILER_CUDA_RTC
# define GLM_HAS_CXX11_STL 0
#elif GLM_COMPILER & GLM_COMPILER_CLANG #elif GLM_COMPILER & GLM_COMPILER_CLANG
# if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED)) # if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED))
# define GLM_HAS_CXX11_STL 1 # define GLM_HAS_CXX11_STL 1

5
glm/simd/platform.h
Unescape View File

@ -80,6 +80,7 @@
#define GLM_COMPILER_CUDA75 0x10000001 #define GLM_COMPILER_CUDA75 0x10000001
#define GLM_COMPILER_CUDA80 0x10000002 #define GLM_COMPILER_CUDA80 0x10000002
#define GLM_COMPILER_CUDA90 0x10000004 #define GLM_COMPILER_CUDA90 0x10000004
#define GLM_COMPILER_CUDA_RTC 0x10000100
// SYCL // SYCL
#define GLM_COMPILER_SYCL 0x00300000 #define GLM_COMPILER_SYCL 0x00300000
@ -122,7 +123,9 @@
# if !defined(CUDA_VERSION) && !defined(GLM_FORCE_CUDA) # if !defined(CUDA_VERSION) && !defined(GLM_FORCE_CUDA)
# include <cuda.h> // make sure version is defined since nvcc does not define it itself! # include <cuda.h> // make sure version is defined since nvcc does not define it itself!
# endif # endif
# if CUDA_VERSION >= 8000 # if defined(__CUDACC_RTC__)
# define GLM_COMPILER GLM_COMPILER_CUDA_RTC
# elif CUDA_VERSION >= 8000
# define GLM_COMPILER GLM_COMPILER_CUDA80 # define GLM_COMPILER GLM_COMPILER_CUDA80
# elif CUDA_VERSION >= 7500 # elif CUDA_VERSION >= 7500
# define GLM_COMPILER GLM_COMPILER_CUDA75 # define GLM_COMPILER GLM_COMPILER_CUDA75

Write Preview
Loading…
Cancel
Save