mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio 2012-12-21 23:05:38 +01:00
commit b78d53d0ac
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/intrinsic_common.inl
View File

@ -62,7 +62,7 @@ namespace detail{
static const ieee754_QNAN absMask; static const ieee754_QNAN absMask;
static const __m128 GLM_VAR_USED abs4Mask = _mm_set_ps1(absMask.f); static const __m128 GLM_VAR_USED abs4Mask = _mm_set_ps1(absMask.f);
static const __m128 GLM_VAR_USED _epi32_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(0x80000000)); static const __m128 GLM_VAR_USED _epi32_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(static_cast<int>(0x80000000)));
//static const __m128 GLM_VAR_USED _epi32_inv_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7FFFFFFF)); //static const __m128 GLM_VAR_USED _epi32_inv_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7FFFFFFF));
//static const __m128 GLM_VAR_USED _epi32_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7F800000)); //static const __m128 GLM_VAR_USED _epi32_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7F800000));
//static const __m128 GLM_VAR_USED _epi32_inv_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x807FFFFF)); //static const __m128 GLM_VAR_USED _epi32_inv_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x807FFFFF));

7
glm/core/setup.hpp
View File

@ -536,6 +536,13 @@
# define GLM_ARCH GLM_ARCH_PURE # define GLM_ARCH GLM_ARCH_PURE
#endif #endif
// With MinGW-W64, including intrinsic headers before intrin.h will produce some errors. The problem is
// that windows.h (and maybe other headers) will silently include intrin.h, which of course causes problems.
// To fix, we just explicitly include intrin.h here.
#if defined(__MINGW32__) && (GLM_ARCH != GLM_ARCH_PURE)
# include <intrin.h>
#endif
//#if(GLM_ARCH != GLM_ARCH_PURE) //#if(GLM_ARCH != GLM_ARCH_PURE)
#if(GLM_ARCH & GLM_ARCH_AVX2) #if(GLM_ARCH & GLM_ARCH_AVX2)
# include <immintrin.h> # include <immintrin.h>

4
glm/gtx/simd_mat4.inl
View File

@ -102,7 +102,7 @@ GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[]
) )
{ {
assert( assert(
i >= fmat4x4SIMD::size_type(0) && //i >= fmat4x4SIMD::size_type(0) &&
i < fmat4x4SIMD::col_size()); i < fmat4x4SIMD::col_size());
return this->Data[i]; return this->Data[i];
@ -114,7 +114,7 @@ GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
) const ) const
{ {
assert( assert(
i >= fmat4x4SIMD::size_type(0) && //i >= fmat4x4SIMD::size_type(0) &&
i < fmat4x4SIMD::col_size()); i < fmat4x4SIMD::col_size());
return this->Data[i]; return this->Data[i];