mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build on Visual C++ 2005

Browse Source
This commit is contained in:
Christophe Riccio 2013-09-24 01:21:55 +02:00
parent 3b3c28a227
commit 5d7c896a3f
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/func_integer.inl
View File

@ -37,7 +37,7 @@
# pragma intrinsic(_BitScanReverse) # pragma intrinsic(_BitScanReverse)
#endif//(GLM_COMPILER & GLM_COMPILER_VC) #endif//(GLM_COMPILER & GLM_COMPILER_VC)
#endif//(GLM_ARCH != GLM_ARCH_PURE) #endif//(GLM_ARCH != GLM_ARCH_PURE)
#include <climits> #include <limits>
namespace glm namespace glm
{ {

27
glm/core/setup.hpp
View File

@ -511,6 +511,25 @@
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
__has_feature(cxx_constexpr)) __has_feature(cxx_constexpr))
// OpenMP
#ifdef _OPENMP
# if(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_COMPILER > GLM_COMPILER_GCC47)
# define GLM_HAS_OPENMP 31
# elif(GLM_COMPILER > GLM_COMPILER_GCC44)
# define GLM_HAS_OPENMP 30
# elif(GLM_COMPILER > GLM_COMPILER_GCC42)
# define GLM_HAS_OPENMP 25
# endif
# endif//(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_COMPILER & GLM_COMPILER_VC)
# if(GLM_COMPILER > GLM_COMPILER_VC2005)
# define GLM_HAS_OPENMP 20
# endif
# endif//(GLM_COMPILER & GLM_COMPILER_GCC)
#endif
// Not standard // Not standard
#define GLM_HAS_ANONYMOUS_UNION (GLM_LANG & GLM_LANG_CXXMS_FLAG) #define GLM_HAS_ANONYMOUS_UNION (GLM_LANG & GLM_LANG_CXXMS_FLAG)
@ -603,6 +622,13 @@
#endif//GLM_ARCH #endif//GLM_ARCH
#if(GLM_ARCH & GLM_ARCH_SSE2) #if(GLM_ARCH & GLM_ARCH_SSE2)
# include <emmintrin.h> # include <emmintrin.h>
# if(GLM_COMPILER == GLM_COMPILER_VC8) // VC8 is missing some intrinsics, workaround
inline float _mm_cvtss_f32(__m128 A) { return A.m128_f32[0]; }
inline __m128 _mm_castpd_ps(__m128d PD) { union { __m128 ps; __m128d pd; } c; c.pd = PD; return c.ps; }
inline __m128d _mm_castps_pd(__m128 PS) { union { __m128 ps; __m128d pd; } c; c.ps = PS; return c.pd; }
inline __m128i _mm_castps_si128(__m128 PS) { union { __m128 ps; __m128i pi; } c; c.ps = PS; return c.pi; }
inline __m128 _mm_castsi128_ps(__m128i PI) { union { __m128 ps; __m128i pi; } c; c.pi = PI; return c.ps; }
# endif
#endif//GLM_ARCH #endif//GLM_ARCH
//#endif//(GLM_ARCH != GLM_ARCH_PURE) //#endif//(GLM_ARCH != GLM_ARCH_PURE)
@ -727,5 +753,4 @@
# define GLM_CONSTEXPR # define GLM_CONSTEXPR
#endif #endif
#endif//GLM_SETUP_INCLUDED #endif//GLM_SETUP_INCLUDED

5
test/gtc/gtc_type_precision.cpp
View File

@ -11,6 +11,9 @@
#include <glm/gtc/type_precision.hpp> #include <glm/gtc/type_precision.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <vector> #include <vector>
#if GLM_HAS_OPENMP
# include <omp.h>
#endif
static int test_scalar_size() static int test_scalar_size()
{ {
@ -855,8 +858,6 @@ static int test_fvec_conversion()
return Error; return Error;
} }
#include <omp.h>
static int test_openmp() static int test_openmp()
{ {
std::vector<glm::u8vec3> VectorA(1000); std::vector<glm::u8vec3> VectorA(1000);