From 189023b61349c3238c3b56b72b51280865f2fc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 18 May 2014 17:10:04 +0200 Subject: [PATCH] Removed redundant preprocessor branches from MeshGLTest. No need to have ES2 workarounds in code that is not compiled for ES2. --- src/Magnum/Test/MeshGLTest.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp index 577e07881..8c5af680c 100644 --- a/src/Magnum/Test/MeshGLTest.cpp +++ b/src/Magnum/Test/MeshGLTest.cpp @@ -1003,12 +1003,7 @@ void MeshGLTest::addVertexBufferBGRA() { MAGNUM_VERIFY_NO_ERROR(); const auto value = Checker(FloatShader("vec4", "valueInterpolated"), - #ifndef MAGNUM_TARGET_GLES2 - RenderbufferFormat::RGBA8, - #else - RenderbufferFormat::RGBA4, - #endif - mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + RenderbufferFormat::RGBA8, mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(value, Color4ub(156, 24, 96, 225)); @@ -1420,18 +1415,15 @@ void MeshGLTest::setInstanceCountBaseInstance() { buffer.setData(data, BufferUsage::StaticDraw); Mesh mesh; - mesh.setInstanceCount(3) + mesh.setBaseVertex(1) + .setInstanceCount(3) .setBaseInstance(72) .addVertexBuffer(buffer, 4, Attribute()); MAGNUM_VERIFY_NO_ERROR(); const auto value = Checker(FloatShader("float", "vec4(valueInterpolated, 0.0, 0.0, 0.0)"), - #ifndef MAGNUM_TARGET_GLES2 RenderbufferFormat::RGBA8, - #else - RenderbufferFormat::RGBA4, - #endif mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); MAGNUM_VERIFY_NO_ERROR();