From 3a766986241a76c890421f597c53b7b48ffdd945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Oct 2022 23:01:03 +0200 Subject: [PATCH] Shaders: explicitly test MeshVisualizerGL::setViewportSize() on UBOs. It shouldn't warn there, unlike all other uniform setters. --- src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index e8de58647..f646d2c45 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -2378,6 +2378,9 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled2D() { MeshVisualizerGL2D shader{MeshVisualizerGL2D::Configuration{} .setFlags(MeshVisualizerGL2D::Flag::UniformBuffers|MeshVisualizerGL2D::Flag::Wireframe|MeshVisualizerGL2D::Flag::NoGeometryShader)}; + /* This should work fine */ + shader.setViewportSize({}); + std::ostringstream out; Error redirectError{&out}; shader @@ -2385,7 +2388,6 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled2D() { .setTransformationProjectionMatrix({}) .setTextureMatrix({}) .setTextureLayer({}) - /* setViewportSize() works on both UBOs and classic */ .setObjectId({}) .setColor({}) .setWireframeColor({}) @@ -2421,6 +2423,9 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled3D() { MeshVisualizerGL3D shader{MeshVisualizerGL3D::Configuration{} .setFlags(MeshVisualizerGL3D::Flag::UniformBuffers|MeshVisualizerGL3D::Flag::Wireframe|MeshVisualizerGL3D::Flag::NoGeometryShader)}; + /* This should work fine */ + shader.setViewportSize({}); + std::ostringstream out; Error redirectError{&out}; shader @@ -2429,7 +2434,6 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled3D() { .setTransformationMatrix({}) .setTextureMatrix({}) .setTextureLayer({}) - /* setViewportSize() works on both UBOs and classic */ .setObjectId({}) .setColor({}) .setWireframeColor({})