From a00f95d2b59bdca45512932d5428d18e99acd00e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 23:11:55 +0000 Subject: [PATCH] Fixed 64 bits in Visual C++ --- glm/gtx/simd_vec4.hpp | 2 +- glm/setup.hpp | 10 +++++----- test/gtx/gtx-simd-mat4.cpp | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 2c9de23b..9441b878 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -18,7 +18,7 @@ #include "../glm.hpp" #if(!(GLM_ARCH & GLM_ARCH_SSE2)) -#error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" +# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" #endif #include "../core/intrinsic_common.hpp" diff --git a/glm/setup.hpp b/glm/setup.hpp index 36034ad6..33f11f2e 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -238,14 +238,14 @@ ///////////////// // Platform -#define GLM_ARCH_PURE 0x0000 -#define GLM_ARCH_SSE2 0x0001 -#define GLM_ARCH_SSE3 0x0002 | GLM_ARCH_SSE2 -#define GLM_ARCH_AVX 0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2 +#define GLM_ARCH_PURE 0x0000 //(0x0000) +#define GLM_ARCH_SSE2 0x0001 //(0x0001) +#define GLM_ARCH_SSE3 0x0003 //(0x0002 | GLM_ARCH_SSE2) +#define GLM_ARCH_AVX 0x0007 //(0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2) #if(defined(GLM_FORCE_PURE)) # define GLM_ARCH GLM_ARCH_PURE -#elif((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86)) +#elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64))) # if(defined(_M_CEE_PURE)) # define GLM_ARCH GLM_ARCH_PURE # elif(GLM_COMPILER >= GLM_COMPILER_VC2010) diff --git a/test/gtx/gtx-simd-mat4.cpp b/test/gtx/gtx-simd-mat4.cpp index cd36c754..48b672c0 100644 --- a/test/gtx/gtx-simd-mat4.cpp +++ b/test/gtx/gtx-simd-mat4.cpp @@ -7,7 +7,6 @@ // File : test/gtx/simd-mat4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2 #include #include #include