From 22d630db5fd53a1e397483c0fbd009227608a502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 10 Feb 2022 13:40:52 +0100 Subject: [PATCH] Math: what's the deal with Emscripten and GLES(!)-specific ifdefs here?! Especially the GLES define is some *really weird* leftover from the days where GL was hardcoded everywhere. What the heck. --- src/Magnum/Math/Test/PackingTest.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Magnum/Math/Test/PackingTest.cpp b/src/Magnum/Math/Test/PackingTest.cpp index 08a454964..37181cf9f 100644 --- a/src/Magnum/Math/Test/PackingTest.cpp +++ b/src/Magnum/Math/Test/PackingTest.cpp @@ -80,10 +80,8 @@ void PackingTest::bitMax() { CORRADE_COMPARE(Implementation::bitMax(), 0x7fff); CORRADE_COMPARE(Implementation::bitMax(), 0xffffffff); CORRADE_COMPARE(Implementation::bitMax(), 0x7fffffff); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE(Implementation::bitMax(), 0xffffffffffffffffull); CORRADE_COMPARE(Implementation::bitMax(), 0x7fffffffffffffffll); - #endif CORRADE_COMPARE((Implementation::bitMax()), 16383); CORRADE_COMPARE((Implementation::bitMax()), 16383); @@ -99,10 +97,8 @@ void PackingTest::unpackUnsigned() { CORRADE_COMPARE((Math::unpack(0)), 0.0); CORRADE_COMPARE((Math::unpack(std::numeric_limits::max())), 1.0); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE((Math::unpack(0)), 0.0); CORRADE_COMPARE((Math::unpack(std::numeric_limits::max())), 1.0); - #endif CORRADE_COMPARE((Math::unpack(0)), 0.0f); CORRADE_COMPARE((Math::unpack(std::numeric_limits::max())), 1.0f); @@ -140,11 +136,9 @@ void PackingTest::unpackSigned() { CORRADE_COMPARE((Math::unpack(0)), 0.0); CORRADE_COMPARE((Math::unpack(std::numeric_limits::max())), 1.0); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE((Math::unpack(std::numeric_limits::min())), -1.0); CORRADE_COMPARE((Math::unpack(0)), 0.0); CORRADE_COMPARE((Math::unpack(std::numeric_limits::max())), 1.0); - #endif CORRADE_COMPARE((Math::unpack(16384)), 0.500015f); CORRADE_COMPARE((Math::unpack(-16384)), -0.500015f); @@ -181,7 +175,6 @@ void PackingTest::packUnsigned() { CORRADE_COMPARE(Math::pack(0.0), 0); CORRADE_COMPARE(Math::pack(1.0), std::numeric_limits::max()); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE(Math::pack(0.0l), 0); { #ifdef _MSC_VER @@ -189,7 +182,6 @@ void PackingTest::packUnsigned() { #endif CORRADE_COMPARE(Math::pack(1.0l), std::numeric_limits::max()); } - #endif CORRADE_COMPARE(Math::pack(0.33f), 21627); CORRADE_COMPARE(Math::pack(0.66f), 43253); @@ -218,7 +210,6 @@ void PackingTest::packSigned() { CORRADE_COMPARE(Math::pack(0.0f), 0); CORRADE_COMPARE(Math::pack(1.0f), std::numeric_limits::max()); - #ifndef MAGNUM_TARGET_GLES CORRADE_COMPARE(Math::pack(-1.0), std::numeric_limits::min()+1); CORRADE_COMPARE(Math::pack(0.0), 0); CORRADE_COMPARE(Math::pack(1.0), std::numeric_limits::max()); @@ -236,7 +227,6 @@ void PackingTest::packSigned() { #endif CORRADE_COMPARE(Math::pack(1.0l), std::numeric_limits::max()); } - #endif CORRADE_COMPARE(Math::pack(-0.33f), -10813); CORRADE_COMPARE(Math::pack(0.66f), 21626); @@ -264,7 +254,6 @@ void PackingTest::reunpackUnsigned() { CORRADE_COMPARE(Math::unpack(Math::pack(0.0)), 0.0); CORRADE_COMPARE(Math::unpack(Math::pack(1.0)), 1.0); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE(Math::unpack(Math::pack(0.0l)), 0.0l); { #ifdef _MSC_VER @@ -272,7 +261,6 @@ void PackingTest::reunpackUnsigned() { #endif CORRADE_COMPARE(Math::unpack(Math::pack(1.0l)), 1.0l); } - #endif } void PackingTest::reunpackSigned() { @@ -288,7 +276,6 @@ void PackingTest::reunpackSigned() { CORRADE_COMPARE(Math::unpack(Math::pack(0.0)), 0.0); CORRADE_COMPARE(Math::unpack(Math::pack(1.0)), 1.0); - #ifndef CORRADE_TARGET_EMSCRIPTEN CORRADE_COMPARE(Math::unpack(Math::pack(-1.0l)), -1.0l); CORRADE_COMPARE(Math::unpack(Math::pack(0.0l)), 0.0l); { @@ -297,7 +284,6 @@ void PackingTest::reunpackSigned() { #endif CORRADE_COMPARE(Math::unpack(Math::pack(1.0l)), 1.0l); } - #endif } void PackingTest::unpackTypeDeduction() {