From 37e7b6d649216a50d1e4ce10dbf2ca1c7813d880 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 20 Nov 2016 20:20:11 +0100 Subject: [PATCH 1/3] Graft fix for issue 212 --- test/gtc/gtc_packing.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp index d1f40e5a..b822a108 100644 --- a/test/gtc/gtc_packing.cpp +++ b/test/gtc/gtc_packing.cpp @@ -173,7 +173,12 @@ int test_Snorm3x10_1x2() glm::vec4 v0 = glm::unpackSnorm3x10_1x2(p0); glm::uint32 p1 = glm::packSnorm3x10_1x2(v0); glm::vec4 v1 = glm::unpackSnorm3x10_1x2(p1); - Error += glm::all(glm::equal(v0, v1)) ? 0 : 1; + + printf("Snorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n", + p0, v0.x, v0.y, v0.z, v0.w, + p1, v1.x, v1.y, v1.z, v1.w); + + Error += glm::all(glm::epsilonEqual(v0, v1, 0.01f)) ? 0 : 1; } return Error; @@ -197,7 +202,12 @@ int test_Unorm3x10_1x2() glm::vec4 v0 = glm::unpackUnorm3x10_1x2(p0); glm::uint32 p1 = glm::packUnorm3x10_1x2(v0); glm::vec4 v1 = glm::unpackUnorm3x10_1x2(p1); - Error += glm::all(glm::equal(v0, v1)) ? 0 : 1; + + printf("Unorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n", + p0, v0.x, v0.y, v0.z, v0.w, + p1, v1.x, v1.y, v1.z, v1.w); + + Error += glm::all(glm::epsilonEqual(v0, v1, 0.001f)) ? 0 : 1; } return Error; @@ -673,6 +683,7 @@ int main() Error += test_F3x9_E1x5(); Error += test_Snorm3x10_1x2(); Error += test_Unorm3x10_1x2(); + Error += test_I3x10_1x2(); Error += test_U3x10_1x2(); Error += test_Half1x16(); From ce8b8bd93ec9f00628b799497804035cc4409e66 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 20 Nov 2016 20:58:12 +0100 Subject: [PATCH 2/3] Fixed GTC_packing test failing on GCC x86 due to denorms #212 --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2426ede1..6a8a9ab3 100644 --- a/readme.md +++ b/readme.md @@ -52,7 +52,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes #### [GLM 0.9.8.4](https://github.com/g-truc/glm/tree/0.9.8) - 201X-XX-XX - +##### Fixes: +- Fixed GTC_packing test failing on GCC x86 due to denorms #212 #### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12 ##### Improvements: From deb8048268428626eab317062a0f265dde283d80 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 20 Nov 2016 20:59:54 +0100 Subject: [PATCH 3/3] Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 6a8a9ab3..0157bdbf 100644 --- a/readme.md +++ b/readme.md @@ -53,7 +53,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) #### [GLM 0.9.8.4](https://github.com/g-truc/glm/tree/0.9.8) - 201X-XX-XX ##### Fixes: -- Fixed GTC_packing test failing on GCC x86 due to denorms #212 +- Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577 #### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12 ##### Improvements: