From 88894045afa526ddce3274586a42b851bb29c417 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 19 Nov 2014 00:40:45 +0100 Subject: [PATCH] Added integer log2 test --- glm/gtc/integer.hpp | 1 + test/gtc/gtc_integer.cpp | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/glm/gtc/integer.hpp b/glm/gtc/integer.hpp index 2c2f3cf1..2196d6db 100644 --- a/glm/gtc/integer.hpp +++ b/glm/gtc/integer.hpp @@ -55,6 +55,7 @@ namespace glm /// @{ + /// @} } //namespace glm diff --git a/test/gtc/gtc_integer.cpp b/test/gtc/gtc_integer.cpp index 8fff20ba..fc89504f 100644 --- a/test/gtc/gtc_integer.cpp +++ b/test/gtc/gtc_integer.cpp @@ -9,7 +9,11 @@ #include #include +#include #include +#include +#include +#include #include #include #include @@ -20,6 +24,24 @@ namespace log2_ { int Error = 0; + int A0(glm::log2(10.f)); + glm::ivec1 B0(glm::log2(glm::vec1(10.f))); + glm::ivec2 C0(glm::log2(glm::vec2(10.f))); + glm::ivec3 D0(glm::log2(glm::vec3(10.f))); + glm::ivec4 E0(glm::log2(glm::vec4(10.f))); + + int A1 = glm::log2(int(10.f)); + glm::ivec1 B1 = glm::log2(glm::ivec1(10.f)); + glm::ivec2 C1 = glm::log2(glm::ivec2(10.f)); + glm::ivec3 D1 = glm::log2(glm::ivec3(10.f)); + glm::ivec4 E1 = glm::log2(glm::ivec4(10.f)); + + Error += A0 == A1 ? 0 : 1; + Error += glm::all(glm::equal(B0, B1)) ? 0 : 1; + Error += glm::all(glm::equal(C0, C1)) ? 0 : 1; + Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; + Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; + return Error; }