From 311c64c3d3ff279434ed05a923c5a9bdbc001b8b Mon Sep 17 00:00:00 2001 From: Ed Hutchins Date: Wed, 5 Sep 2012 14:48:02 -0700 Subject: [PATCH] Fixed SSE detection --- glm/core/setup.hpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index c573b702..c842fe20 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -510,19 +510,12 @@ #elif((GLM_PLATFORM & GLM_PLATFORM_APPLE) && (GLM_COMPILER & GLM_COMPILER_GCC)) # 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 -# elif(defined(__AVX__)) -# define GLM_ARCH GLM_ARCH_AVX -# elif(defined(__SSE4__)) -# define GLM_ARCH GLM_ARCH_SSE4 -# elif(defined(__SSE3__)) -# define GLM_ARCH GLM_ARCH_SSE3 -# elif(defined(__SSE2__)) -# define GLM_ARCH GLM_ARCH_SSE2 -# else -# define GLM_ARCH GLM_ARCH_PURE -# endif +# define GLM_ARCH (GLM_ARCH_PURE \ +| (defined(__AVX2__) ? GLM_ARCH_AVX2 : 0) \ +| (defined(__AVX__) ? GLM_ARCH_AVX : 0) \ +| (defined(__SSE4__) ? GLM_ARCH_SSE4 : 0) \ +| (defined(__SSE3__) ? GLM_ARCH_SSE3 : 0) \ +| (defined(__SSE2__) ? GLM_ARCH_SSE2 : 0)) #else # define GLM_ARCH GLM_ARCH_PURE #endif