From 37495b0841958f4e40cce3535ac8c542e103c5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Oct 2021 13:11:34 +0200 Subject: [PATCH] GL: make renderbuffer format match the shader format in MeshGLTest. This doesn't actually fix the WebGL-specific error (there it additionally disallows mismatched signedness in a vertex attribute) but is nevertheless good to have correct. --- src/Magnum/GL/Test/MeshGLTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 991c76dc5..2b4f2b6ef 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -1451,8 +1451,8 @@ void MeshGLTest::addVertexBufferUnsignedIntWithShort() { MAGNUM_VERIFY_NO_GL_ERROR(); - const auto value = Checker(IntegerShader("uint"), RenderbufferFormat::R16I, mesh) - .get(PixelFormat::RedInteger, PixelType::Short); + const auto value = Checker(IntegerShader("uint"), RenderbufferFormat::R16UI, mesh) + .get(PixelFormat::RedInteger, PixelType::UnsignedShort); #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_WEBGL) CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::SwiftShader, @@ -1489,8 +1489,8 @@ void MeshGLTest::addVertexBufferIntWithUnsignedShort() { MAGNUM_VERIFY_NO_GL_ERROR(); - const auto value = Checker(IntegerShader("int"), RenderbufferFormat::R16UI, mesh) - .get(PixelFormat::RedInteger, PixelType::UnsignedShort); + const auto value = Checker(IntegerShader("int"), RenderbufferFormat::R16I, mesh) + .get(PixelFormat::RedInteger, PixelType::Short); #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_WEBGL) CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::SwiftShader,