From a00952cf950440c4137aa910c70c9e66dae3ae9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Mar 2023 13:19:45 +0100 Subject: [PATCH] Shaders: light count isn't used to test anything here. --- src/Magnum/Shaders/Test/PhongGLTest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index cf643aa6f..55d286cc2 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -413,16 +413,16 @@ constexpr struct { constexpr struct { const char* name; PhongGL::Flags flags; - UnsignedInt lightCount, materialCount, drawCount; + UnsignedInt materialCount, drawCount; const char* message; } ConstructUniformBuffersInvalidData[]{ - {"zero draws", PhongGL::Flag::UniformBuffers, 1, 1, 0, + {"zero draws", PhongGL::Flag::UniformBuffers, 1, 0, "draw count can't be zero"}, - {"zero materials", PhongGL::Flag::UniformBuffers, 1, 0, 1, + {"zero materials", PhongGL::Flag::UniformBuffers, 0, 1, "material count can't be zero"}, - {"texture arrays but no transformation", PhongGL::Flag::UniformBuffers|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays, 1, 1, 1, + {"texture arrays but no transformation", PhongGL::Flag::UniformBuffers|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays, 1, 1, "texture arrays require texture transformation enabled as well if uniform buffers are used"}, - {"light culling but no UBOs", PhongGL::Flag::LightCulling, 1, 1, 1, + {"light culling but no UBOs", PhongGL::Flag::LightCulling, 1, 1, "light culling requires uniform buffers to be enabled"} }; #endif @@ -1666,7 +1666,6 @@ void PhongGLTest::constructUniformBuffersInvalid() { Error redirectError{&out}; PhongGL{PhongGL::Configuration{} .setFlags(data.flags) - .setLightCount(data.lightCount) .setMaterialCount(data.materialCount) .setDrawCount(data.drawCount)}; CORRADE_COMPARE(out.str(), Utility::formatString(