1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Bug: https://bugs.gentoo.org/638312
Upstream commit: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db
From e37cf6e47fa4305c82845103b17af58f6cfe23db Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Thu, 17 Aug 2017 00:08:37 +0200
Subject: [PATCH] Fixed GCC 7.1.0 failing tests #666
---
test/core/core_type_mat2x4.cpp | 4 +++-
test/core/core_type_mat3x4.cpp | 4 +++-
test/core/core_type_mat4x4.cpp | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
index 17afebf91..eea3e46f4 100644
--- a/test/core/core_type_mat2x4.cpp
+++ b/test/core/core_type_mat2x4.cpp
@@ -1,3 +1,5 @@
+#include <glm/gtc/epsilon.hpp>
+#include <glm/gtc/constants.hpp>
#include <glm/vector_relational.hpp>
#include <glm/mat2x2.hpp>
#include <glm/mat2x3.hpp>
@@ -83,7 +85,7 @@ namespace cast
glm::mat2x4 Identity(1.0f);
for(glm::length_t i = 0, length = B.length(); i < length; ++i)
- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
+ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
return Error;
}
diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
index e3b78d31b..74a45d87a 100644
--- a/test/core/core_type_mat3x4.cpp
+++ b/test/core/core_type_mat3x4.cpp
@@ -1,3 +1,5 @@
+#include <glm/gtc/epsilon.hpp>
+#include <glm/gtc/constants.hpp>
#include <glm/vector_relational.hpp>
#include <glm/mat2x2.hpp>
#include <glm/mat2x3.hpp>
@@ -87,7 +89,7 @@ namespace cast
glm::mat3x4 Identity(1.0f);
for(glm::length_t i = 0, length = B.length(); i < length; ++i)
- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
+ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
return Error;
}
diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
index 3966c2b7f..fd2aca8b4 100644
--- a/test/core/core_type_mat4x4.cpp
+++ b/test/core/core_type_mat4x4.cpp
@@ -1,3 +1,4 @@
+#include <glm/gtc/constants.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/matrix.hpp>
#include <glm/mat2x2.hpp>
@@ -263,7 +264,7 @@ namespace cast
glm::mat4x4 Identity(1.0f);
for(glm::length_t i = 0, length = B.length(); i < length; ++i)
- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
+ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
return Error;
}
|