Browse Source

GL: add XFAIL to some well-known failures with Intel Windows drivers.

pull/331/head
Vladimír Vondruš 7 years ago
parent
commit
fa62122c98
  1. 5
      src/Magnum/GL/Test/FramebufferGLTest.cpp
  2. 12
      src/Magnum/GL/Test/MeshGLTest.cpp

5
src/Magnum/GL/Test/FramebufferGLTest.cpp

@ -2148,6 +2148,11 @@ void FramebufferGLTest::implementationColorReadFormat() {
PixelFormat format = framebuffer.implementationColorReadFormat();
PixelType type = framebuffer.implementationColorReadType();
#ifdef CORRADE_TARGET_WINDOWS
CORRADE_EXPECT_FAIL_IF((Context::current().detectedDriver() & Context::DetectedDriver::IntelWindows) && data.renderbufferFormat != RenderbufferFormat::RGBA8,
"Framebuffer format queries on Intel Windows drivers are broken beyond repair for any non-trivial value.");
#endif
MAGNUM_VERIFY_NO_GL_ERROR();
CORRADE_COMPARE(format, data.expectedFormat);
CORRADE_COMPARE(type, data.expectedType);

12
src/Magnum/GL/Test/MeshGLTest.cpp

@ -1071,7 +1071,11 @@ void MeshGLTest::addVertexBufferMatrixNxNd() {
MAGNUM_VERIFY_NO_GL_ERROR();
{
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted");
auto drivers = Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia;
#ifdef CORRADE_TARGET_WINDOWS
drivers |= Context::DetectedDriver::IntelWindows;
#endif
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & drivers, "Somehow only first two values are extracted on AMD, NVidia and Intel Windows drivers.");
CORRADE_COMPARE(value, Math::Vector3<UnsignedShort>(315, 65201, 2576));
}
@ -1169,7 +1173,11 @@ void MeshGLTest::addVertexBufferMatrixMxNd() {
MAGNUM_VERIFY_NO_GL_ERROR();
{
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted");
auto drivers = Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia;
#ifdef CORRADE_TARGET_WINDOWS
drivers |= Context::DetectedDriver::IntelWindows;
#endif
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & drivers, "Somehow only first two values are extracted on AMD, NVidia and Intel Windows drivers.");
CORRADE_COMPARE(value, Math::Vector3<UnsignedShort>(315, 65201, 2576));
}

Loading…
Cancel
Save