From 5e31a42d0bd3a7cedc8c3c4295d5742d727f6df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 1 Jul 2025 18:55:28 +0200 Subject: [PATCH] GL: older Mesa doesn't have a validation failure here. Neither NVidia has, maybe that's just not a good test case. Though, who cares, this API is likely not actually used by anybody anyway. --- src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp index 54285d1b9..dd1ec6dfd 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp @@ -820,7 +820,11 @@ void main() { Containers::Pair result = program.validate(); MAGNUM_VERIFY_NO_GL_ERROR(); { - CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, "NVidia doesn't treat conflicting sampler locations as a failure."); + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, + "NVidia doesn't treat conflicting sampler locations as a failure."); + /* Likely also other versions. Fails as expected on Mesa 24 and 25. */ + CORRADE_EXPECT_FAIL_IF(Context::current().versionString().contains("Mesa 20"), + "Mesa 20 doesn't treat conflicting sampler locations as a failure."); CORRADE_VERIFY(!result.first()); /* The message shouldn't be empty */ CORRADE_COMPARE_AS(result.second(),