mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-09-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2016-05-01 12:39:16 +02:00
parent 83999c749a
commit 1becd76c5f
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/detail/func_matrix_simd.inl
View File

@ -389,7 +389,7 @@ namespace detail
// + m[0][1] * Inverse[1][0] // + m[0][1] * Inverse[1][0]
// + m[0][2] * Inverse[2][0] // + m[0][2] * Inverse[2][0]
// + m[0][3] * Inverse[3][0]; // + m[0][3] * Inverse[3][0];
__m128 Det0 = sse_dot_ps(in[0], Row2); __m128 Det0 = dot_ps(in[0], Row2);
return Det0; return Det0;
} }
@ -456,7 +456,7 @@ namespace detail
// + m[0][2] * DetCof[2] // + m[0][2] * DetCof[2]
// + m[0][3] * DetCof[3]; // + m[0][3] * DetCof[3];
return sse_dot_ps(m[0], DetCof); return dot_ps(m[0], DetCof);
} }
GLM_FUNC_QUALIFIER __m128 sse_det_ps GLM_FUNC_QUALIFIER __m128 sse_det_ps
@ -522,7 +522,7 @@ namespace detail
// + m[0][2] * DetCof[2] // + m[0][2] * DetCof[2]
// + m[0][3] * DetCof[3]; // + m[0][3] * DetCof[3];
return sse_dot_ps(m[0], DetCof); return dot_ps(m[0], DetCof);
} }
GLM_FUNC_QUALIFIER void sse_inverse_ps(__m128 const in[4], __m128 out[4]) GLM_FUNC_QUALIFIER void sse_inverse_ps(__m128 const in[4], __m128 out[4])
@ -735,7 +735,7 @@ namespace detail
// + m[0][1] * Inverse[1][0] // + m[0][1] * Inverse[1][0]
// + m[0][2] * Inverse[2][0] // + m[0][2] * Inverse[2][0]
// + m[0][3] * Inverse[3][0]; // + m[0][3] * Inverse[3][0];
__m128 Det0 = sse_dot_ps(in[0], Row2); __m128 Det0 = dot_ps(in[0], Row2);
__m128 Rcp0 = _mm_div_ps(one, Det0); __m128 Rcp0 = _mm_div_ps(one, Det0);
//__m128 Rcp0 = _mm_rcp_ps(Det0); //__m128 Rcp0 = _mm_rcp_ps(Det0);
@ -956,7 +956,7 @@ namespace detail
// + m[0][1] * Inverse[1][0] // + m[0][1] * Inverse[1][0]
// + m[0][2] * Inverse[2][0] // + m[0][2] * Inverse[2][0]
// + m[0][3] * Inverse[3][0]; // + m[0][3] * Inverse[3][0];
__m128 Det0 = sse_dot_ps(in[0], Row2); __m128 Det0 = dot_ps(in[0], Row2);
__m128 Rcp0 = _mm_rcp_ps(Det0); __m128 Rcp0 = _mm_rcp_ps(Det0);
//__m128 Rcp0 = _mm_div_ps(one, Det0); //__m128 Rcp0 = _mm_div_ps(one, Det0);
// Inverse /= Determinant; // Inverse /= Determinant;

12
glm/detail/type_vec4.inl
View File

@ -1180,12 +1180,6 @@ namespace glm
} }
}//namespace glm }//namespace glm
#if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS #if GLM_ARCH != GLM_FORCE_PURE && GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS
# if GLM_ARCH & GLM_ARCH_AVX2 # include "type_vec4_simd.inl"
# include "type_vec4_avx2.inl" #endif
# elif GLM_ARCH & GLM_ARCH_AVX
# include "type_vec4_avx.inl"
# elif GLM_ARCH & GLM_ARCH_SSE2
# include "type_vec4_sse2.inl"
# endif
#endif//GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS

4
test/gtc/gtc_bitfield.cpp
View File

@ -32,9 +32,7 @@
#include <glm/gtc/bitfield.hpp> #include <glm/gtc/bitfield.hpp>
#include <glm/gtc/type_precision.hpp> #include <glm/gtc/type_precision.hpp>
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>
#if GLM_ARCH != GLM_ARCH_PURE #include <glm/integer.hpp>
# include <glm/detail/intrinsic_integer.hpp>
#endif
#include <ctime> #include <ctime>
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>