From bbfa2ff8631471a984d93aa9d62e63e2d30d6f59 Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 17 Jan 2024 16:04:42 +0100 Subject: [PATCH] gna --- test/ext/ext_scalar_integer.cpp | 83 +++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/test/ext/ext_scalar_integer.cpp b/test/ext/ext_scalar_integer.cpp index 59e3cdcd..8da91be2 100644 --- a/test/ext/ext_scalar_integer.cpp +++ b/test/ext/ext_scalar_integer.cpp @@ -10,6 +10,11 @@ namespace isPowerOfTwo { +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +#endif + template struct type { @@ -17,7 +22,11 @@ namespace isPowerOfTwo bool Return; }; - int test_int16() +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic pop +#endif + + static int test_int16() { type const Data[] = { @@ -40,7 +49,7 @@ namespace isPowerOfTwo return Error; } - int test_uint16() + static int test_uint16() { type const Data[] = { @@ -63,7 +72,7 @@ namespace isPowerOfTwo return Error; } - int test_int32() + static int test_int32() { type const Data[] = { @@ -86,7 +95,7 @@ namespace isPowerOfTwo return Error; } - int test_uint32() + static int test_uint32() { type const Data[] = { @@ -109,7 +118,7 @@ namespace isPowerOfTwo return Error; } - int test() + static int test() { int Error = 0; @@ -125,7 +134,8 @@ namespace isPowerOfTwo namespace nextPowerOfTwo_advanced { template - GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value) + GLM_FUNC_QUALIFIER + static genIUType highestBitValue(genIUType Value) { genIUType tmp = Value; genIUType result = genIUType(0); @@ -138,7 +148,8 @@ namespace nextPowerOfTwo_advanced } template - GLM_FUNC_QUALIFIER genType nextPowerOfTwo_loop(genType value) + GLM_FUNC_QUALIFIER + static genType nextPowerOfTwo_loop(genType value) { return glm::isPowerOfTwo(value) ? value : highestBitValue(value) << 1; } @@ -150,7 +161,7 @@ namespace nextPowerOfTwo_advanced genType Return; }; - int test_int32() + static int test_int32() { type const Data[] = { @@ -179,7 +190,7 @@ namespace nextPowerOfTwo_advanced return Error; } - int test_uint32() + static int test_uint32() { type const Data[] = { @@ -206,7 +217,7 @@ namespace nextPowerOfTwo_advanced return Error; } - int perf() + static int perf() { int Error(0); @@ -231,7 +242,7 @@ namespace nextPowerOfTwo_advanced return Error; } - int test() + static int test() { int Error(0); @@ -245,7 +256,7 @@ namespace nextPowerOfTwo_advanced namespace prevPowerOfTwo { template - int run() + static int run() { int Error = 0; @@ -264,7 +275,7 @@ namespace prevPowerOfTwo return Error; } - int test() + static int test() { int Error = 0; @@ -285,7 +296,7 @@ namespace prevPowerOfTwo namespace nextPowerOfTwo { template - int run() + static int run() { int Error = 0; @@ -304,7 +315,7 @@ namespace nextPowerOfTwo return Error; } - int test() + static int test() { int Error = 0; @@ -333,7 +344,7 @@ namespace prevMultiple }; template - int run() + static int run() { type const Data[] = { @@ -352,7 +363,7 @@ namespace prevMultiple return Error; } - int test() + static int test() { int Error = 0; @@ -374,7 +385,7 @@ namespace nextMultiple { static glm::uint const Multiples = 128; - int perf_nextMultiple(glm::uint Samples) + static int perf_nextMultiple(glm::uint Samples) { std::vector Results(Samples * Multiples); @@ -398,13 +409,14 @@ namespace nextMultiple } template - GLM_FUNC_QUALIFIER T nextMultipleMod(T Source, T Multiple) + GLM_FUNC_QUALIFIER + static T nextMultipleMod(T Source, T Multiple) { T const Tmp = Source - static_cast(1); return Tmp + (Multiple - (Tmp % Multiple)); } - int perf_nextMultipleMod(glm::uint Samples) + static int perf_nextMultipleMod(glm::uint Samples) { std::vector Results(Samples * Multiples); @@ -432,7 +444,8 @@ namespace nextMultiple # pragma warning(disable : 4146) #endif template - GLM_FUNC_QUALIFIER T nextMultipleNeg(T Source, T Multiple) + GLM_FUNC_QUALIFIER + static T nextMultipleNeg(T Source, T Multiple) { if(Source > static_cast(0)) { @@ -446,7 +459,7 @@ namespace nextMultiple # pragma warning(pop) #endif - int perf_nextMultipleNeg(glm::uint Samples) + static int perf_nextMultipleNeg(glm::uint Samples) { std::vector Results(Samples * Multiples); @@ -470,12 +483,13 @@ namespace nextMultiple } template - GLM_FUNC_QUALIFIER T nextMultipleUFloat(T Source, T Multiple) + GLM_FUNC_QUALIFIER + static T nextMultipleUFloat(T Source, T Multiple) { return Source + (Multiple - std::fmod(Source, Multiple)); } - int perf_nextMultipleUFloat(glm::uint Samples) + static int perf_nextMultipleUFloat(glm::uint Samples) { std::vector Results(Samples * Multiples); @@ -499,7 +513,8 @@ namespace nextMultiple } template - GLM_FUNC_QUALIFIER T nextMultipleFloat(T Source, T Multiple) + GLM_FUNC_QUALIFIER + static T nextMultipleFloat(T Source, T Multiple) { if(Source > static_cast(0)) return Source + (Multiple - std::fmod(Source, Multiple)); @@ -507,7 +522,7 @@ namespace nextMultiple return Source + std::fmod(-Source, Multiple); } - int perf_nextMultipleFloat(glm::uint Samples) + static int perf_nextMultipleFloat(glm::uint Samples) { std::vector Results(Samples * Multiples); @@ -539,7 +554,7 @@ namespace nextMultiple }; template - int test_uint() + static int test_uint() { type const Data[] = { @@ -567,7 +582,7 @@ namespace nextMultiple return Error; } - int perf() + static int perf() { int Error = 0; @@ -587,7 +602,7 @@ namespace nextMultiple return Error; } - int test() + static int test() { int Error = 0; @@ -616,7 +631,7 @@ namespace findNSB }; template - int run() + static int run() { type const Data[] = { @@ -644,7 +659,7 @@ namespace findNSB return Error; } - int test() + static int test() { int Error = 0; @@ -675,10 +690,8 @@ int main() Error += prevMultiple::test(); Error += nextMultiple::test(); -# ifdef NDEBUG - Error += nextPowerOfTwo_advanced::perf(); - Error += nextMultiple::perf(); -# endif//NDEBUG + Error += nextPowerOfTwo_advanced::perf(); + Error += nextMultiple::perf(); return Error; }