Browse Source

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 e9b07ef4ce, so it seems
that the driver got fixed since. There are still the broken cases in
Texture3D tho, updated in the previous commit.
pull/651/merge
Vladimír Vondruš 1 year ago
parent
commit
cfc81e68b2
  1. 12
      src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp
  2. 12
      src/Magnum/GL/Test/TextureArrayGLTest.cpp

12
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<UnsignedByte>(image.data()),
Containers::arrayView(CompressedSubDataComplete),
TestSuite::Compare::Container);
}
CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::arrayView(CompressedSubDataComplete),
TestSuite::Compare::Container);
#endif
}

12
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<UnsignedByte>(image.data()),
Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
}
CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
#endif
}

Loading…
Cancel
Save