From 389fb2457d5e9b02ddda47325d89b5f377c14b41 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 6 Aug 2018 19:28:42 +0200 Subject: [PATCH] Added constexpr relational operators --- glm/detail/func_vector_relational.inl | 112 +++++++++++++++++++------- glm/ext/scalar_relational.hpp | 4 +- glm/ext/scalar_relational.inl | 4 +- glm/ext/vector_relational.hpp | 8 +- glm/ext/vector_relational.inl | 8 +- glm/gtc/quaternion.hpp | 4 +- glm/vector_relational.hpp | 8 +- test/core/core_type_mat4x4.cpp | 22 ++--- test/ext/ext_vector_dvec1.cpp | 4 +- test/ext/ext_vector_vec1.cpp | 3 - test/gtc/gtc_quaternion.cpp | 6 +- test/gtc/gtc_type_aligned.cpp | 2 + 12 files changed, 121 insertions(+), 64 deletions(-) diff --git a/glm/detail/func_vector_relational.inl b/glm/detail/func_vector_relational.inl index d0c28515..83045a65 100644 --- a/glm/detail/func_vector_relational.inl +++ b/glm/detail/func_vector_relational.inl @@ -1,5 +1,4 @@ /// @ref core -/// @file glm/detail/func_vector_relational.inl #include "compute_vector_relational.hpp" @@ -10,58 +9,119 @@ # define GLM_BUG_VC_INIT #endif -namespace glm +namespace glm{ +namespace detail { - template - GLM_FUNC_QUALIFIER vec lessThan(vec const& x, vec const& y) + enum relational_type { - assert(x.length() == y.length()); + LESS, + LESS_EQUAL, + GREATER, + GREATER_EQUAL + }; + template + struct relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T Src0, T Src1); + }; + + template <> + struct relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T Src0, T Src1) + { + return Src0 < Src1; + } + }; + + template <> + struct relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T Src0, T Src1) + { + return Src0 <= Src1; + } + }; + + template <> + struct relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T Src0, T Src1) + { + return Src0 > Src1; + } + }; + + template <> + struct relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T Src0, T Src1) + { + return Src0 >= Src1; + } + }; + + template + struct loop_relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static void call(vecBType& Dst, vecType const& Src0, vecType const& Src1) + { + Dst[I] = relational::call(Src0[I], Src1[I]); + loop_relational::call(Dst, Src0, Src1); + } + }; + + template + struct loop_relational + { + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static void call(vecBType&, vecType const&, vecType const&) + {} + }; +}//namespace detail + + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec lessThan(vec const& x, vec const& y) + { vec Result GLM_BUG_VC_INIT; - for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] < y[i]; - + detail::loop_relational<0, L, detail::LESS>::call(Result, x, y); return Result; } template - GLM_FUNC_QUALIFIER vec lessThanEqual(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec lessThanEqual(vec const& x, vec const& y) { - assert(x.length() == y.length()); - vec Result GLM_BUG_VC_INIT; - for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] <= y[i]; + detail::loop_relational<0, L, detail::LESS_EQUAL>::call(Result, x, y); return Result; } template - GLM_FUNC_QUALIFIER vec greaterThan(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec greaterThan(vec const& x, vec const& y) { - assert(x.length() == y.length()); - vec Result GLM_BUG_VC_INIT; - for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] > y[i]; + detail::loop_relational<0, L, detail::GREATER>::call(Result, x, y); return Result; } template - GLM_FUNC_QUALIFIER vec greaterThanEqual(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec greaterThanEqual(vec const& x, vec const& y) { - assert(x.length() == y.length()); - vec Result GLM_BUG_VC_INIT; - for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] >= y[i]; + detail::loop_relational<0, L, detail::GREATER_EQUAL>::call(Result, x, y); return Result; } template GLM_FUNC_QUALIFIER vec equal(vec const& x, vec const& y) { - assert(x.length() == y.length()); - vec Result GLM_BUG_VC_INIT; for(length_t i = 0; i < x.length(); ++i) Result[i] = detail::compute_equal::is_iec559>::call(x[i], y[i]); @@ -71,8 +131,6 @@ namespace glm template GLM_FUNC_QUALIFIER vec notEqual(vec const& x, vec const& y) { - assert(x.length() == y.length()); - vec Result GLM_BUG_VC_INIT; for(length_t i = 0; i < x.length(); ++i) Result[i] = !detail::compute_equal::is_iec559>::call(x[i], y[i]); diff --git a/glm/ext/scalar_relational.hpp b/glm/ext/scalar_relational.hpp index a2b314a8..258aa323 100644 --- a/glm/ext/scalar_relational.hpp +++ b/glm/ext/scalar_relational.hpp @@ -29,7 +29,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL bool equal(genType const& x, genType const& y, genType const& epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const& x, genType const& y, genType const& epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -38,7 +38,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL bool notEqual(genType const& x, genType const& y, genType const& epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, genType const& epsilon); /// @} }//namespace glm diff --git a/glm/ext/scalar_relational.inl b/glm/ext/scalar_relational.inl index 0eb17012..32358e3e 100644 --- a/glm/ext/scalar_relational.inl +++ b/glm/ext/scalar_relational.inl @@ -7,13 +7,13 @@ namespace glm { template - GLM_FUNC_QUALIFIER bool equal(genType const& x, genType const& y, genType const& epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool equal(genType const& x, genType const& y, genType const& epsilon) { return abs(x - y) <= epsilon; } template - GLM_FUNC_QUALIFIER bool notEqual(genType const& x, genType const& y, genType const& epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, genType const& epsilon) { return abs(x - y) > epsilon; } diff --git a/glm/ext/vector_relational.hpp b/glm/ext/vector_relational.hpp index 1965ce1b..eaf22494 100644 --- a/glm/ext/vector_relational.hpp +++ b/glm/ext/vector_relational.hpp @@ -34,7 +34,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL vec equal(vec const& x, vec const& y, T epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, T epsilon); /// Returns the component-wise comparison of |x - y| < epsilon. /// True if this expression is satisfied. @@ -45,7 +45,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL vec equal(vec const& x, vec const& y, vec const& epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -56,7 +56,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL vec notEqual(vec const& x, vec const& y, T epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, T epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -67,7 +67,7 @@ namespace glm /// /// @see ext_vector_relational template - GLM_FUNC_DECL vec notEqual(vec const& x, vec const& y, vec const& epsilon); + GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& epsilon); /// @} }//namespace glm diff --git a/glm/ext/vector_relational.inl b/glm/ext/vector_relational.inl index fcd17e8d..49792be5 100644 --- a/glm/ext/vector_relational.inl +++ b/glm/ext/vector_relational.inl @@ -8,25 +8,25 @@ namespace glm { template - GLM_FUNC_QUALIFIER vec equal(vec const& x, vec const& y, T epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, T epsilon) { return equal(x, y, vec(epsilon)); } template - GLM_FUNC_QUALIFIER vec equal(vec const& x, vec const& y, vec const& epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& epsilon) { return lessThanEqual(abs(x - y), epsilon); } template - GLM_FUNC_QUALIFIER vec notEqual(vec const& x, vec const& y, T epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, T epsilon) { return notEqual(x, y, vec(epsilon)); } template - GLM_FUNC_QUALIFIER vec notEqual(vec const& x, vec const& y, vec const& epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& epsilon) { return greaterThan(abs(x - y), epsilon); } diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 87ed95a0..e3d6940f 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -45,9 +45,9 @@ namespace glm union { struct { T x, y, z, w;}; - }; - typename detail::storage<4, T, detail::is_aligned::value>::type data; + typename detail::storage<4, T, detail::is_aligned::value>::type data; + }; # else T x, y, z, w; # endif diff --git a/glm/vector_relational.hpp b/glm/vector_relational.hpp index ed996710..b0953635 100644 --- a/glm/vector_relational.hpp +++ b/glm/vector_relational.hpp @@ -33,7 +33,7 @@ namespace glm /// @see GLSL lessThan man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL vec lessThan(vec const& x, vec const& y); + GLM_FUNC_DECL GLM_CONSTEXPR vec lessThan(vec const& x, vec const& y); /// Returns the component-wise comparison of result x <= y. /// @@ -43,7 +43,7 @@ namespace glm /// @see GLSL lessThanEqual man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL vec lessThanEqual(vec const& x, vec const& y); + GLM_FUNC_DECL GLM_CONSTEXPR vec lessThanEqual(vec const& x, vec const& y); /// Returns the component-wise comparison of result x > y. /// @@ -53,7 +53,7 @@ namespace glm /// @see GLSL greaterThan man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL vec greaterThan(vec const& x, vec const& y); + GLM_FUNC_DECL GLM_CONSTEXPR vec greaterThan(vec const& x, vec const& y); /// Returns the component-wise comparison of result x >= y. /// @@ -63,7 +63,7 @@ namespace glm /// @see GLSL greaterThanEqual man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL vec greaterThanEqual(vec const& x, vec const& y); + GLM_FUNC_DECL GLM_CONSTEXPR vec greaterThanEqual(vec const& x, vec const& y); /// Returns the component-wise comparison of result x == y. /// diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 34ccc463..9f0b7855 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -13,29 +13,29 @@ static int test_operators() float const Epsilon = 0.001f; - glm::mat4x4 const M(2.0f); - glm::mat4x4 const N(1.0f); - glm::vec4 const U(2.0f); + matType const M(2.0f); + matType const N(1.0f); + vecType const U(2.0f); { - glm::mat4 const P = N * 2.0f; + matType const P = N * 2.0f; Error += glm::all(glm::equal(P, M, Epsilon)) ? 0 : 1; - glm::mat4 const Q = M / 2.0f; + matType const Q = M / 2.0f; Error += glm::all(glm::equal(Q, N, Epsilon)) ? 0 : 1; } { - glm::vec4 const V = M * U; - Error += glm::all(glm::equal(V, glm::vec4(4.f), Epsilon)) ? 0 : 1; + vecType const V = M * U; + Error += glm::all(glm::equal(V, vecType(4.f), Epsilon)) ? 0 : 1; - glm::vec4 const W = U / M; - Error += glm::all(glm::equal(V, W, Epsilon)) ? 0 : 1; + vecType const W = U / M; + Error += glm::all(glm::equal(W, vecType(1.f), Epsilon)) ? 0 : 1; } { - glm::mat4 const O = M * N; - Error += glm::all(glm::equal(O, glm::mat4(4.f), Epsilon)) ? 0 : 1; + matType const O = M * N; + Error += glm::all(glm::equal(O, matType(2.f), Epsilon)) ? 0 : 1; } return Error; diff --git a/test/ext/ext_vector_dvec1.cpp b/test/ext/ext_vector_dvec1.cpp index e9232f45..4289b012 100644 --- a/test/ext/ext_vector_dvec1.cpp +++ b/test/ext/ext_vector_dvec1.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -89,9 +90,6 @@ static int test_constexpr() { # if GLM_CONFIG_CONSTEXP == GLM_ENABLE static_assert(genType::length() == 1, "GLM: Failed constexpr"); - static_assert(glm::equal(genType(1)[0], 1.0, glm::epsilon()), "GLM: Failed constexpr"); - static_assert(glm::all(glm::equal(genType(1), genType(glm::vec1(1), glm::epsilon()), "GLM: Failed constexpr"); - static_assert(glm::all(glm::notEqual(genType(1), genType(0), glm::epsilon())), "GLM: Failed constexpr"); # endif return 0; diff --git a/test/ext/ext_vector_vec1.cpp b/test/ext/ext_vector_vec1.cpp index cd8ebe9a..4835b7f8 100644 --- a/test/ext/ext_vector_vec1.cpp +++ b/test/ext/ext_vector_vec1.cpp @@ -89,9 +89,6 @@ static int test_constexpr() { # if GLM_CONFIG_CONSTEXP == GLM_ENABLE static_assert(genType::length() == 1, "GLM: Failed constexpr"); - static_assert(glm::equal(genType(1)[0], 1.0f, glm::epsilon()), "GLM: Failed constexpr"); - static_assert(glm::all(glm::equal(genType(1), genType(glm::vec1(1), glm::epsilon()), "GLM: Failed constexpr"); - static_assert(glm::all(glm::notEqual(genType(1), genType(0), glm::epsilon())), "GLM: Failed constexpr"); # endif return 0; diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index 4c9bffc5..f7ad13e2 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -301,8 +301,10 @@ int test_size() { int Error = 0; - Error += 16 == sizeof(glm::quat) ? 0 : 1; - Error += 32 == sizeof(glm::dquat) ? 0 : 1; + std::size_t const A = sizeof(glm::quat); + Error += 16 == A ? 0 : 1; + std::size_t const B = sizeof(glm::dquat); + Error += 32 == B ? 0 : 1; Error += glm::quat().length() == 4 ? 0 : 1; Error += glm::dquat().length() == 4 ? 0 : 1; Error += glm::quat::length() == 4 ? 0 : 1; diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index 4449b5c7..f14f146a 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -2,7 +2,9 @@ #if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE #include +#include #include +#include GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_lowp is not aligned"); GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_mediump is not aligned");