Browse Source

Added AVX2 detection for GLM tests

Christophe Riccio 11 years ago
parent
commit
011a056267
2 changed files with 4 additions and 1 deletions
  1. 1 0
      CMakeLists.txt
  2. 3 1
      glm/detail/setup.hpp

+ 1 - 0
CMakeLists.txt

@@ -78,6 +78,7 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX2)
 	elseif(MSVC)
+		message("AVX2")
 		add_definitions(/arch:AVX2)
 	endif()
 elseif(GLM_TEST_ENABLE_SIMD_AVX)

+ 3 - 1
glm/detail/setup.hpp

@@ -592,7 +592,9 @@
 #		define GLM_ARCH GLM_ARCH_PURE
 #	endif
 #elif GLM_COMPILER & GLM_COMPILER_VC
-#	if _M_IX86_FP == 2 && defined(__AVX__)
+#	if defined(__AVX2__)
+#		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_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 #	elif _M_IX86_FP == 2
 #		define GLM_ARCH (GLM_ARCH_SSE2)