Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed builtin GLM_ARCH_SSE4 #204

Christophe Riccio 11 years ago
parent
7b03f18e32
commit
a2f4df2b1d
2 changed files with 14 additions and 8 deletions
Split View Show Diff Stats
  1. 13 8
      glm/detail/setup.hpp
  2. 1 0
      readme.txt

+ 13 - 8
glm/detail/setup.hpp
View File 

@@ -552,23 +552,26 @@
 
 
 #define GLM_ARCH_PURE		0x0000
 
 #define GLM_ARCH_SSE2		0x0001
 
-#define GLM_ARCH_SSE3		0x0002// | GLM_ARCH_SSE2
 
-#define GLM_ARCH_AVX		0x0008// | GLM_ARCH_SSE3 | GLM_ARCH_SSE2
 
-#define GLM_ARCH_AVX2		0x0010// | GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2
 
+#define GLM_ARCH_SSE3		0x0002
 
+#define GLM_ARCH_SSE4		0x0004
 
+#define GLM_ARCH_AVX		0x0008
 
+#define GLM_ARCH_AVX2		0x0010
 
 
 #if(defined(GLM_FORCE_PURE))
 
 #	define GLM_ARCH GLM_ARCH_PURE
 
 #elif(defined(GLM_FORCE_AVX2))
 
-#	define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#	define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #elif(defined(GLM_FORCE_AVX))
 
-#	define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#	define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#elif(defined(GLM_FORCE_SSE4))
 
+#	define GLM_ARCH (GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #elif(defined(GLM_FORCE_SSE3))
 
 #	define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #elif(defined(GLM_FORCE_SSE2))
 
 #	define GLM_ARCH (GLM_ARCH_SSE2)
 
 #elif(GLM_COMPILER & GLM_COMPILER_VC)
 
 #	if _M_IX86_FP == 2 && defined(__AVX__)
 
-#		define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#		define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #	elif _M_IX86_FP == 2
 
 #		define GLM_ARCH (GLM_ARCH_SSE2)
 
 #	else
 
@@ -578,9 +581,11 @@
 
 #	define GLM_ARCH GLM_ARCH_PURE
 
 #elif(((GLM_COMPILER & GLM_COMPILER_GCC) && (defined(__i386__) || defined(__x86_64__))) || (GLM_COMPILER & GLM_COMPILER_LLVM_GCC))
 
 #	if defined(__AVX2__) 
-#		define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#		define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #	elif defined(__AVX__)
 
-#		define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#		define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
+#	elif defined(__SSE4_1__ )
 
+#		define GLM_ARCH (GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #	elif defined(__SSE3__)
 
 #		define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #	elif defined(__SSE2__)

+ 1 - 0
readme.txt
View File 

@@ -43,6 +43,7 @@ GLM 0.9.5.4: 2014-0X-XX
 
 - Added FindGLM install for CMake #189
 
 - Fixed GTX_color_space - saturation #195
 
 - Fixed glm::isinf and glm::isnan for with Android NDK 9d #191
 
+- Fixed builtin GLM_ARCH_SSE4 #204
 
 
 ================================================================================
 
 GLM 0.9.5.3: 2014-04-02