From 09083fef056ee12e727e1262e2c649f819a4ac96 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 2 Dec 2014 20:48:26 +0100 Subject: [PATCH] Added more log2 tests --- readme.txt | 2 +- test/gtc/gtc_integer.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index cd2bb67d..fec7dd1c 100644 --- a/readme.txt +++ b/readme.txt @@ -66,7 +66,7 @@ http://glm.g-truc.net/glm.pdf GLM 0.9.6.1: 2014-12-XX -------------------------------------------------------------------------------- Fixes: -- Fixed uaddCarry error for Cuda build #276 +- Fixed scalar uaddCarry build error with Cuda #276 ================================================================================ GLM 0.9.6.0: 2014-11-30 diff --git a/test/gtc/gtc_integer.cpp b/test/gtc/gtc_integer.cpp index b306b843..7c2099bd 100644 --- a/test/gtc/gtc_integer.cpp +++ b/test/gtc/gtc_integer.cpp @@ -67,6 +67,18 @@ namespace log2_ Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; + glm::uint64 A2 = glm::log2(glm::uint64(10.f)); + glm::u64vec1 B2 = glm::log2(glm::u64vec1(10.f)); + glm::u64vec2 C2 = glm::log2(glm::u64vec2(10.f)); + glm::u64vec3 D2 = glm::log2(glm::u64vec3(10.f)); + glm::u64vec4 E2 = glm::log2(glm::u64vec4(10.f)); + + Error += A2 == glm::uint64(1) ? 0 : 1; + Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1; + Error += glm::all(glm::equal(C2, glm::u64vec2(1))) ? 0 : 1; + Error += glm::all(glm::equal(D2, glm::u64vec3(1))) ? 0 : 1; + Error += glm::all(glm::equal(E2, glm::u64vec4(1))) ? 0 : 1; + return Error; }