mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
Christophe Riccio 2011-06-07 15:14:26 +01:00
parent dc87aa849b
commit 3904d5c59c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/core/core_type_half.cpp
View File

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

4
test/gtx/gtx_simd_mat4.cpp
View File

@ -275,12 +275,14 @@ int main()
// shuffle test // shuffle test
glm::simdVec4 A(1.0f, 2.0f, 3.0f, 4.0f); glm::simdVec4 A(1.0f, 2.0f, 3.0f, 4.0f);
glm::simdVec4 B(5.0f, 6.0f, 7.0f, 8.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_glm();
Error += test_compute_gtx(); Error += test_compute_gtx();
float Det = glm::determinant(glm::simdMat4(1.0)); 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)); glm::simdMat4 D = glm::matrixCompMult(glm::simdMat4(1.0), glm::simdMat4(1.0));
return Error; return Error;