From c5db5ea3ad0a48fa56d860d070733a466e65437e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 23 Jan 2022 19:33:40 +0100 Subject: [PATCH] Shaders: minor test cleanup. --- src/Magnum/Shaders/Test/FlatGLTest.cpp | 36 ++++++++++++++++-------- src/Magnum/Shaders/Test/PhongGLTest.cpp | 37 +++++++++++++++++-------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 77e1e1700..84112a388 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -365,16 +365,19 @@ constexpr struct { FlatGL2D::Flags flags; Float maxThreshold, meanThreshold; } RenderInstancedData[] { - {"colored", "instanced2D.tga", "instanced3D.tga", + {"colored", + "instanced2D.tga", "instanced3D.tga", {}, /* Minor differences on SwiftShader */ 164.4f, 0.094f}, - {"textured", "instanced-textured2D.tga", "instanced-textured3D.tga", + {"textured", + "instanced-textured2D.tga", "instanced-textured3D.tga", FlatGL2D::Flag::InstancedTextureOffset|FlatGL2D::Flag::Textured, /* Minor differences on SwiftShader */ 192.67f, 0.140f}, #ifndef MAGNUM_TARGET_GLES2 - {"texture array", "instanced-textured2D.tga", "instanced-textured3D.tga", + {"texture array", + "instanced-textured2D.tga", "instanced-textured3D.tga", FlatGL2D::Flag::InstancedTextureOffset|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around); minor differences on @@ -393,41 +396,50 @@ constexpr struct { UnsignedInt uniformIncrement; Float maxThreshold, meanThreshold; } RenderMultiData[] { - {"bind with offset, colored", "multidraw2D.tga", "multidraw3D.tga", + {"bind with offset, colored", + "multidraw2D.tga", "multidraw3D.tga", {}, 1, 1, 16, 0.0f, 0.0f}, - {"bind with offset, textured", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"bind with offset, textured", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured, 1, 1, 16, /* Minor differences on ARM Mali */ 2.34f, 0.01f}, - {"bind with offset, texture array", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"bind with offset, texture array", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays, 1, 1, 16, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around) */ 65.0f, 0.15f}, - {"draw offset, colored", "multidraw2D.tga", "multidraw3D.tga", + {"draw offset, colored", + "multidraw2D.tga", "multidraw3D.tga", {}, 2, 3, 1, 0.0f, 0.0f}, - {"draw offset, textured", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"draw offset, textured", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured, 2, 3, 1, /* Minor differences on ARM Mali */ 2.34f, 0.01f}, - {"draw offset, texture array", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"draw offset, texture array", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays, 2, 3, 1, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around) */ 65.0f, 0.15f}, - {"multidraw, colored", "multidraw2D.tga", "multidraw3D.tga", + {"multidraw, colored", + "multidraw2D.tga", "multidraw3D.tga", FlatGL2D::Flag::MultiDraw, 2, 3, 1, 0.0f, 0.0f}, - {"multidraw, textured", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"multidraw, textured", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::MultiDraw|FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured, 2, 3, 1, /* Minor differences on ARM Mali */ 2.34f, 0.01f}, - {"multidraw, texture array", "multidraw-textured2D.tga", "multidraw-textured3D.tga", + {"multidraw, texture array", + "multidraw-textured2D.tga", "multidraw-textured3D.tga", FlatGL2D::Flag::MultiDraw|FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays, 2, 3, 1, /* Some difference at the UV edge (texture is wrapping in the 2D case diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 39134b3d7..0f6fc838f 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -668,16 +668,20 @@ constexpr struct { PhongGL::Flags flags; Float maxThreshold, meanThreshold; } RenderInstancedData[] { - {"diffuse color", "instanced.tga", {}, + {"diffuse color", + "instanced.tga", + {}, /* Minor differences on SwiftShader */ 81.0f, 0.06f}, - {"diffuse texture", "instanced-textured.tga", + {"diffuse texture", + "instanced-textured.tga", PhongGL::Flag::DiffuseTexture|PhongGL::Flag::InstancedTextureOffset, /* Minor differences on SwiftShader */ 112.0f, 0.09f}, /** @todo test normal when there's usable texture */ #ifndef MAGNUM_TARGET_GLES2 - {"diffuse texture array", "instanced-textured.tga", + {"diffuse texture array", + "instanced-textured.tga", PhongGL::Flag::DiffuseTexture|PhongGL::Flag::InstancedTextureOffset|PhongGL::Flag::TextureArrays, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around); minor differences on @@ -695,49 +699,58 @@ constexpr struct { UnsignedInt uniformIncrement; Float maxThreshold, meanThreshold; } RenderMultiData[] { - {"bind with offset, colored", "multidraw.tga", + {"bind with offset, colored", + "multidraw.tga", {}, 2, 1, 1, 16, /* Minor differences on ARM Mali */ 3.34f, 0.01f}, - {"bind with offset, textured", "multidraw-textured.tga", + {"bind with offset, textured", + "multidraw-textured.tga", PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, 2, 1, 1, 16, /* Minor differences on ARM Mali */ 4.67f, 0.02f}, - {"bind with offset, texture array", "multidraw-textured.tga", + {"bind with offset, texture array", + "multidraw-textured.tga", PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays, 2, 1, 1, 16, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around) */ 50.34f, 0.131f}, - {"draw offset, colored", "multidraw.tga", + {"draw offset, colored", + "multidraw.tga", {}, 4, 2, 3, 1, /* Minor differences on ARM Mali */ 3.34f, 0.01f}, - {"draw offset, textured", "multidraw-textured.tga", + {"draw offset, textured", + "multidraw-textured.tga", PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, 4, 2, 3, 1, /* Minor differences on ARM Mali */ 4.67f, 0.02f}, - {"draw offset, texture array", "multidraw-textured.tga", + {"draw offset, texture array", + "multidraw-textured.tga", PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays, 4, 2, 3, 1, /* Some difference at the UV edge (texture is wrapping in the 2D case while the 2D array has a black area around) */ 50.34f, 0.131f}, - {"multidraw, colored", "multidraw.tga", + {"multidraw, colored", + "multidraw.tga", PhongGL::Flag::MultiDraw, 4, 2, 3, 1, /* Minor differences on ARM Mali */ 3.34f, 0.01f}, - {"multidraw, textured", "multidraw-textured.tga", + {"multidraw, textured", + "multidraw-textured.tga", PhongGL::Flag::MultiDraw|PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, 4, 2, 3, 1, /* Minor differences on ARM Mali */ 4.67f, 0.02f}, - {"multidraw, texture array", "multidraw-textured.tga", + {"multidraw, texture array", + "multidraw-textured.tga", PhongGL::Flag::MultiDraw|PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays, 4, 2, 3, 1, /* Some difference at the UV edge (texture is wrapping in the 2D case