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

Fixed 64 bits in Visual C++

Browse Source
master
Christophe Riccio ago%!(EXTRA string=14 years)
parent b0325a9714
commit a00f95d2b5
3 changed files with 6 additions and 7 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/gtx/simd_vec4.hpp
  2. 10
      glm/setup.hpp
  3. 1
      test/gtx/gtx-simd-mat4.cpp

2
glm/gtx/simd_vec4.hpp
Unescape View File

@ -18,7 +18,7 @@
#include "../glm.hpp" #include "../glm.hpp"
#if(!(GLM_ARCH & GLM_ARCH_SSE2)) #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 #endif
#include "../core/intrinsic_common.hpp" #include "../core/intrinsic_common.hpp"

10
glm/setup.hpp
Unescape View File

@ -238,14 +238,14 @@
///////////////// /////////////////
// Platform // Platform
#define GLM_ARCH_PURE 0x0000 #define GLM_ARCH_PURE 0x0000 //(0x0000)
#define GLM_ARCH_SSE2 0x0001 #define GLM_ARCH_SSE2 0x0001 //(0x0001)
#define GLM_ARCH_SSE3 0x0002 | GLM_ARCH_SSE2 #define GLM_ARCH_SSE3 0x0003 //(0x0002 | GLM_ARCH_SSE2)
#define GLM_ARCH_AVX 0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2 #define GLM_ARCH_AVX 0x0007 //(0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
#if(defined(GLM_FORCE_PURE)) #if(defined(GLM_FORCE_PURE))
# define GLM_ARCH GLM_ARCH_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)) # if(defined(_M_CEE_PURE))
# define GLM_ARCH GLM_ARCH_PURE # define GLM_ARCH GLM_ARCH_PURE
# elif(GLM_COMPILER >= GLM_COMPILER_VC2010) # elif(GLM_COMPILER >= GLM_COMPILER_VC2010)

1
test/gtx/gtx-simd-mat4.cpp
Unescape View File

@ -7,7 +7,6 @@
// File : test/gtx/simd-mat4.cpp // File : test/gtx/simd-mat4.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>

Write Preview
Loading…
Cancel
Save