Browse Source

Shaders: no, these are not expected to fail on macOS.

pull/364/head
Vladimír Vondruš 7 years ago
parent
commit
fd6bf54769
  1. 4
      src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
  2. 2
      src/Magnum/Shaders/Test/FlatGLTest.cpp
  3. 2
      src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
  4. 2
      src/Magnum/Shaders/Test/PhongGLTest.cpp
  5. 4
      src/Magnum/Shaders/Test/VectorGLTest.cpp
  6. 4
      src/Magnum/Shaders/Test/VertexColorGLTest.cpp

4
src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp

@ -48,22 +48,22 @@ DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() {
void DistanceFieldVectorGLTest::construct2D() { void DistanceFieldVectorGLTest::construct2D() {
DistanceFieldVector2D shader; DistanceFieldVector2D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }
void DistanceFieldVectorGLTest::construct3D() { void DistanceFieldVectorGLTest::construct3D() {
DistanceFieldVector3D shader; DistanceFieldVector3D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

2
src/Magnum/Shaders/Test/FlatGLTest.cpp

@ -193,11 +193,11 @@ template<UnsignedInt dimensions> void FlatGLTest::construct() {
Flat<dimensions> shader{data.flags}; Flat<dimensions> shader{data.flags};
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

2
src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp

@ -55,11 +55,11 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
void MeshVisualizerGLTest::construct() { void MeshVisualizerGLTest::construct() {
MeshVisualizer shader; MeshVisualizer shader;
CORRADE_COMPARE(shader.flags(), MeshVisualizer::Flags{}); CORRADE_COMPARE(shader.flags(), MeshVisualizer::Flags{});
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

2
src/Magnum/Shaders/Test/PhongGLTest.cpp

@ -297,11 +297,11 @@ void PhongGLTest::construct() {
Phong shader{data.flags, data.lightCount}; Phong shader{data.flags, data.lightCount};
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_COMPARE(shader.lightCount(), data.lightCount); CORRADE_COMPARE(shader.lightCount(), data.lightCount);
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

4
src/Magnum/Shaders/Test/VectorGLTest.cpp

@ -48,22 +48,22 @@ VectorGLTest::VectorGLTest() {
void VectorGLTest::construct2D() { void VectorGLTest::construct2D() {
Vector2D shader; Vector2D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }
void VectorGLTest::construct3D() { void VectorGLTest::construct3D() {
Vector3D shader; Vector3D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

4
src/Magnum/Shaders/Test/VertexColorGLTest.cpp

@ -48,22 +48,22 @@ VertexColorGLTest::VertexColorGLTest() {
void VertexColorGLTest::construct2D() { void VertexColorGLTest::construct2D() {
VertexColor2D shader; VertexColor2D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }
void VertexColorGLTest::construct3D() { void VertexColorGLTest::construct3D() {
VertexColor3D shader; VertexColor3D shader;
CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.id());
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
} }
} }

Loading…
Cancel
Save