From cfc81e68b2e1ae3a56fc3af64a906d0ded333a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 25 Jan 2025 19:06:11 +0100 Subject: [PATCH] GL: these 3D compressed subimage uploads no longer fail on NV. IIRC this still failed when I did the last changes to these tests in October 2024 in e9b07ef4ce2528b0d3d6b1d15955bea411f72e8b, so it seems that the driver got fixed since. There are still the broken cases in Texture3D tho, updated in the previous commit. --- src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp | 12 +++--------- src/Magnum/GL/Test/TextureArrayGLTest.cpp | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp index f39e46e07..8d4d0d1a1 100644 --- a/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp +++ b/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp @@ -1211,15 +1211,9 @@ void CubeMapTextureArrayGLTest::compressedSubImage() { MAGNUM_VERIFY_NO_GL_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6})); - - { - CORRADE_EXPECT_FAIL_IF(data.storage != CompressedPixelStorage{} && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), - "Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images"); - - CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), - Containers::arrayView(CompressedSubDataComplete), - TestSuite::Compare::Container); - } + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); #endif } diff --git a/src/Magnum/GL/Test/TextureArrayGLTest.cpp b/src/Magnum/GL/Test/TextureArrayGLTest.cpp index de0db9748..26f1a34e3 100644 --- a/src/Magnum/GL/Test/TextureArrayGLTest.cpp +++ b/src/Magnum/GL/Test/TextureArrayGLTest.cpp @@ -1837,15 +1837,9 @@ void TextureArrayGLTest::compressedSubImage2D() { MAGNUM_VERIFY_NO_GL_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4})); - - { - CORRADE_EXPECT_FAIL_IF(data.storage != CompressedPixelStorage{} && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), - "Non-default compressed pixel storage for array textures behaves weirdly on NVidia"); - - CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), - Containers::arrayView(CompressedSubData2DComplete), - TestSuite::Compare::Container); - } + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); #endif }