Browse Source

Fixed warnings

Christophe Riccio 14 years ago
parent
commit
3904d5c59c
2 changed files with 7 additions and 4 deletions
  1. 4 3
      test/core/core_type_half.cpp
  2. 3 1
      test/gtx/gtx_simd_mat4.cpp

+ 4 - 3
test/core/core_type_half.cpp

@@ -20,13 +20,14 @@ int main()
 	glm::half D(C);
 	float E = D;
 	int F = float(C);
+	Result += float(F) == E ? 0 : 1;
 	glm::half G = B * C;
 	glm::half H = G / C;
 	H += glm::half(1.0f);
 	double J = H;
 	int I = float(H);
-
-	Result = Result && J == 3.0;
+	Result += J == 3.0 ? 0 : 1;
+	Result += I == 3 ? 0 : 1;
 	
-	return Result != 0;
+	return Result;
 }

+ 3 - 1
test/gtx/gtx_simd_mat4.cpp

@@ -275,12 +275,14 @@ int main()
 	// shuffle test
 	glm::simdVec4 A(1.0f, 2.0f, 3.0f, 4.0f);
 	glm::simdVec4 B(5.0f, 6.0f, 7.0f, 8.0f);
-	__m128 C = _mm_shuffle_ps(A.Data, B.Data, _MM_SHUFFLE(1, 0, 1, 0));
+	//__m128 C = _mm_shuffle_ps(A.Data, B.Data, _MM_SHUFFLE(1, 0, 1, 0));
 
 	Error += test_compute_glm();
 	Error += test_compute_gtx();
 	
 	float Det = glm::determinant(glm::simdMat4(1.0));
+	Error += Det == 1.0f ? 0 : 1;
+	
 	glm::simdMat4 D = glm::matrixCompMult(glm::simdMat4(1.0), glm::simdMat4(1.0));
 
 	return Error;