ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Shaders: minor test cleanup.

pull/547/head
Vladimír Vondruš 4 years ago
parent
66f179f952
commit
c5db5ea3ad
2 changed files with 49 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/Magnum/Shaders/Test/FlatGLTest.cpp
  2. 37
      src/Magnum/Shaders/Test/PhongGLTest.cpp

36
src/Magnum/Shaders/Test/FlatGLTest.cpp
Unescape View File

@ -365,16 +365,19 @@ constexpr struct {
FlatGL2D::Flags flags; FlatGL2D::Flags flags;
Float maxThreshold, meanThreshold; Float maxThreshold, meanThreshold;
} RenderInstancedData[] { } RenderInstancedData[] {
{"colored", "instanced2D.tga", "instanced3D.tga", {"colored",
"instanced2D.tga", "instanced3D.tga",
{}, {},
/* Minor differences on SwiftShader */ /* Minor differences on SwiftShader */
164.4f, 0.094f}, 164.4f, 0.094f},
{"textured", "instanced-textured2D.tga", "instanced-textured3D.tga", {"textured",
"instanced-textured2D.tga", "instanced-textured3D.tga",
FlatGL2D::Flag::InstancedTextureOffset|FlatGL2D::Flag::Textured, FlatGL2D::Flag::InstancedTextureOffset|FlatGL2D::Flag::Textured,
/* Minor differences on SwiftShader */ /* Minor differences on SwiftShader */
192.67f, 0.140f}, 192.67f, 0.140f},
#ifndef MAGNUM_TARGET_GLES2 #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, FlatGL2D::Flag::InstancedTextureOffset|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* 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 while the 2D array has a black area around); minor differences on
@ -393,41 +396,50 @@ constexpr struct {
UnsignedInt uniformIncrement; UnsignedInt uniformIncrement;
Float maxThreshold, meanThreshold; Float maxThreshold, meanThreshold;
} RenderMultiData[] { } RenderMultiData[] {
{"bind with offset, colored", "multidraw2D.tga", "multidraw3D.tga", {"bind with offset, colored",
"multidraw2D.tga", "multidraw3D.tga",
{}, 1, 1, 16, 0.0f, 0.0f}, {}, 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, FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured,
1, 1, 16, 1, 1, 16,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
2.34f, 0.01f}, 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, FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays,
1, 1, 16, 1, 1, 16,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case
while the 2D array has a black area around) */ while the 2D array has a black area around) */
65.0f, 0.15f}, 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}, 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, FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured,
2, 3, 1, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
2.34f, 0.01f}, 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, FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays,
2, 3, 1, 2, 3, 1,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case
while the 2D array has a black area around) */ while the 2D array has a black area around) */
65.0f, 0.15f}, 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}, 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, FlatGL2D::Flag::MultiDraw|FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured,
2, 3, 1, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
2.34f, 0.01f}, 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, FlatGL2D::Flag::MultiDraw|FlatGL2D::Flag::TextureTransformation|FlatGL2D::Flag::Textured|FlatGL2D::Flag::TextureArrays,
2, 3, 1, 2, 3, 1,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case

37
src/Magnum/Shaders/Test/PhongGLTest.cpp
Unescape View File

@ -668,16 +668,20 @@ constexpr struct {
PhongGL::Flags flags; PhongGL::Flags flags;
Float maxThreshold, meanThreshold; Float maxThreshold, meanThreshold;
} RenderInstancedData[] { } RenderInstancedData[] {
{"diffuse color", "instanced.tga", {}, {"diffuse color",
"instanced.tga",
{},
/* Minor differences on SwiftShader */ /* Minor differences on SwiftShader */
81.0f, 0.06f}, 81.0f, 0.06f},
{"diffuse texture", "instanced-textured.tga", {"diffuse texture",
"instanced-textured.tga",
PhongGL::Flag::DiffuseTexture|PhongGL::Flag::InstancedTextureOffset, PhongGL::Flag::DiffuseTexture|PhongGL::Flag::InstancedTextureOffset,
/* Minor differences on SwiftShader */ /* Minor differences on SwiftShader */
112.0f, 0.09f}, 112.0f, 0.09f},
/** @todo test normal when there's usable texture */ /** @todo test normal when there's usable texture */
#ifndef MAGNUM_TARGET_GLES2 #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, PhongGL::Flag::DiffuseTexture|PhongGL::Flag::InstancedTextureOffset|PhongGL::Flag::TextureArrays,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* 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 while the 2D array has a black area around); minor differences on
@ -695,49 +699,58 @@ constexpr struct {
UnsignedInt uniformIncrement; UnsignedInt uniformIncrement;
Float maxThreshold, meanThreshold; Float maxThreshold, meanThreshold;
} RenderMultiData[] { } RenderMultiData[] {
{"bind with offset, colored", "multidraw.tga", {"bind with offset, colored",
"multidraw.tga",
{}, {},
2, 1, 1, 16, 2, 1, 1, 16,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
3.34f, 0.01f}, 3.34f, 0.01f},
{"bind with offset, textured", "multidraw-textured.tga", {"bind with offset, textured",
"multidraw-textured.tga",
PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture,
2, 1, 1, 16, 2, 1, 1, 16,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
4.67f, 0.02f}, 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, PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays,
2, 1, 1, 16, 2, 1, 1, 16,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case
while the 2D array has a black area around) */ while the 2D array has a black area around) */
50.34f, 0.131f}, 50.34f, 0.131f},
{"draw offset, colored", "multidraw.tga", {"draw offset, colored",
"multidraw.tga",
{}, {},
4, 2, 3, 1, 4, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
3.34f, 0.01f}, 3.34f, 0.01f},
{"draw offset, textured", "multidraw-textured.tga", {"draw offset, textured",
"multidraw-textured.tga",
PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture,
4, 2, 3, 1, 4, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
4.67f, 0.02f}, 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, PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays,
4, 2, 3, 1, 4, 2, 3, 1,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case
while the 2D array has a black area around) */ while the 2D array has a black area around) */
50.34f, 0.131f}, 50.34f, 0.131f},
{"multidraw, colored", "multidraw.tga", {"multidraw, colored",
"multidraw.tga",
PhongGL::Flag::MultiDraw, PhongGL::Flag::MultiDraw,
4, 2, 3, 1, 4, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
3.34f, 0.01f}, 3.34f, 0.01f},
{"multidraw, textured", "multidraw-textured.tga", {"multidraw, textured",
"multidraw-textured.tga",
PhongGL::Flag::MultiDraw|PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture, PhongGL::Flag::MultiDraw|PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture,
4, 2, 3, 1, 4, 2, 3, 1,
/* Minor differences on ARM Mali */ /* Minor differences on ARM Mali */
4.67f, 0.02f}, 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, PhongGL::Flag::MultiDraw|PhongGL::Flag::TextureTransformation|PhongGL::Flag::DiffuseTexture|PhongGL::Flag::TextureArrays,
4, 2, 3, 1, 4, 2, 3, 1,
/* Some difference at the UV edge (texture is wrapping in the 2D case /* Some difference at the UV edge (texture is wrapping in the 2D case

Write Preview
Loading…
Cancel
Save