Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 193236933b0f4ab91b1625b64e2187e2db4e0e8f / . / meta-openembedded / meta-oe / recipes-graphics / glm / glm / 0001-glm-Remove-redundant-double-semi-colons.patch
blob: 6e50f2cf234f6374513029a18e4694a4759cf570 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame^]1From 3f6869e392b061f2932f3df155b6cc37e3e7d342 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 1 Mar 2019 10:56:05 -0800
4Subject: [PATCH] glm: Remove redundant double semi-colons
5
6Make clang happy
7/glm/gtc/../ext/../detail/../simd/common.h:106:45: error: empty expression statement has no effect; remove unnecessary ';' to silence this warning [-Werror,-Wextra-semi-stmt]
8| glm_vec4 const or0 = _mm_or_ps(and0, and1);;
9| ^
10| 1 error generated.
11
12Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/874]
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 glm/gtx/associated_min_max.inl | 8 ++++----
17 glm/simd/common.h | 2 +-
18 test/core/core_func_exponential.cpp | 6 +++---
19 test/gtx/gtx_easing.cpp | 4 ++--
20 4 files changed, 10 insertions(+), 10 deletions(-)
21
22diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl
23index 1a459add..5186c471 100644
24--- a/glm/gtx/associated_min_max.inl
25+++ b/glm/gtx/associated_min_max.inl
26@@ -86,7 +86,7 @@ GLM_FUNC_QUALIFIER U associatedMin
27 )
28 {
29 T Test1 = min(x, y);
30- T Test2 = min(z, w);;
31+ T Test2 = min(z, w);
32 U Result1 = x < y ? a : b;
33 U Result2 = z < w ? c : d;
34 U Result = Test1 < Test2 ? Result1 : Result2;
35@@ -152,7 +152,7 @@ GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
36 for(length_t i = 0, n = Result.length(); i < n; ++i)
37 {
38 T Test1 = min(x[i], y[i]);
39- T Test2 = min(z[i], w[i]);;
40+ T Test2 = min(z[i], w[i]);
41 U Result1 = x[i] < y[i] ? a : b;
42 U Result2 = z[i] < w[i] ? c : d;
43 Result[i] = Test1 < Test2 ? Result1 : Result2;
44@@ -278,7 +278,7 @@ GLM_FUNC_QUALIFIER U associatedMax
45 )
46 {
47 T Test1 = max(x, y);
48- T Test2 = max(z, w);;
49+ T Test2 = max(z, w);
50 U Result1 = x > y ? a : b;
51 U Result2 = z > w ? c : d;
52 U Result = Test1 > Test2 ? Result1 : Result2;
53@@ -344,7 +344,7 @@ GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
54 for(length_t i = 0, n = Result.length(); i < n; ++i)
55 {
56 T Test1 = max(x[i], y[i]);
57- T Test2 = max(z[i], w[i]);;
58+ T Test2 = max(z[i], w[i]);
59 U Result1 = x[i] > y[i] ? a : b;
60 U Result2 = z[i] > w[i] ? c : d;
61 Result[i] = Test1 > Test2 ? Result1 : Result2;
62diff --git a/glm/simd/common.h b/glm/simd/common.h
63index d07920a3..9b017cb4 100644
64--- a/glm/simd/common.h
65+++ b/glm/simd/common.h
66@@ -103,7 +103,7 @@ GLM_FUNC_QUALIFIER glm_vec4 glm_vec4_sign(glm_vec4 x)
67 glm_vec4 const cmp1 = _mm_cmpgt_ps(x, zro0);
68 glm_vec4 const and0 = _mm_and_ps(cmp0, _mm_set1_ps(-1.0f));
69 glm_vec4 const and1 = _mm_and_ps(cmp1, _mm_set1_ps(1.0f));
70- glm_vec4 const or0 = _mm_or_ps(and0, and1);;
71+ glm_vec4 const or0 = _mm_or_ps(and0, and1);
72 return or0;
73 }
74
75diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp
76index a414a4e9..380cdfb1 100644
77--- a/test/core/core_func_exponential.cpp
78+++ b/test/core/core_func_exponential.cpp
79@@ -153,13 +153,13 @@ static int test_inversesqrt()
80 float A = glm::inversesqrt(16.f) * glm::sqrt(16.f);
81 Error += glm::equal(A, 1.f, 0.01f) ? 0 : 1;
82
83- glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);;
84+ glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);
85 Error += glm::all(glm::equal(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
86
87- glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);;
88+ glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);
89 Error += glm::all(glm::equal(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
90
91- glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);;
92+ glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);
93 Error += glm::all(glm::equal(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
94
95 glm::vec4 E = glm::inversesqrt(glm::vec4(16.f)) * glm::sqrt(16.f);
96diff --git a/test/gtx/gtx_easing.cpp b/test/gtx/gtx_easing.cpp
97index b3e13997..0e98cd53 100644
98--- a/test/gtx/gtx_easing.cpp
99+++ b/test/gtx/gtx_easing.cpp
100@@ -34,7 +34,7 @@ namespace
101 r = glm::circularEaseOut(a);
102 r = glm::circularEaseInOut(a);
103
104- r = glm::exponentialEaseIn(a);;
105+ r = glm::exponentialEaseIn(a);
106 r = glm::exponentialEaseOut(a);
107 r = glm::exponentialEaseInOut(a);
108
109@@ -46,7 +46,7 @@ namespace
110 r = glm::backEaseOut(a);
111 r = glm::backEaseInOut(a);
112
113- r = glm::bounceEaseIn(a);;
114+ r = glm::bounceEaseIn(a);
115 r = glm::bounceEaseOut(a);
116 r = glm::bounceEaseInOut(a);
117 }
118--
1192.21.0
120