Browse Source

Fixed build

Christophe Riccio 9 years ago
parent
commit
1becd76c5f
3 changed files with 9 additions and 17 deletions
  1. 5 5
      glm/detail/func_matrix_simd.inl
  2. 3 9
      glm/detail/type_vec4.inl
  3. 1 3
      test/gtc/gtc_bitfield.cpp

+ 5 - 5
glm/detail/func_matrix_simd.inl

@@ -389,7 +389,7 @@ namespace detail
 		//						+ m[0][1] * Inverse[1][0]
 		//						+ m[0][2] * Inverse[2][0]
 		//						+ m[0][3] * Inverse[3][0];
-		__m128 Det0 = sse_dot_ps(in[0], Row2);
+		__m128 Det0 = dot_ps(in[0], Row2);
 		return Det0;
 	}
 
@@ -456,7 +456,7 @@ namespace detail
 		//	 + m[0][2] * DetCof[2]
 		//	 + 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
@@ -522,7 +522,7 @@ namespace detail
 		//	 + m[0][2] * DetCof[2]
 		//	 + 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])
@@ -735,7 +735,7 @@ namespace detail
 		//						+ m[0][1] * Inverse[1][0] 
 		//						+ m[0][2] * Inverse[2][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_rcp_ps(Det0);
 
@@ -956,7 +956,7 @@ namespace detail
 		//						+ m[0][1] * Inverse[1][0] 
 		//						+ m[0][2] * Inverse[2][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_div_ps(one, Det0);
 		//	Inverse /= Determinant;

+ 3 - 9
glm/detail/type_vec4.inl

@@ -1180,12 +1180,6 @@ namespace glm
 	}
 }//namespace glm
 
-#if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS
-#	if GLM_ARCH & GLM_ARCH_AVX2
-#		include "type_vec4_avx2.inl"
-#	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
+#if GLM_ARCH != GLM_FORCE_PURE && GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS
+#	include "type_vec4_simd.inl"
+#endif

+ 1 - 3
test/gtc/gtc_bitfield.cpp

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