From f2ba5602a4f644d7ac16ee08295d0a610d451998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 18 Oct 2019 01:22:56 +0200 Subject: [PATCH] GL: Intel Windows drivers 26 are less shitty w/ double attributes. --- src/Magnum/GL/Test/MeshGLTest.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 8ffb0f5ee..351e6c697 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -1071,11 +1071,9 @@ void MeshGLTest::addVertexBufferMatrixNxNd() { MAGNUM_VERIFY_NO_GL_ERROR(); { - 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."); + /* Used to be a problem on Intel Windows drivers 23, not a problem on + 26 anymore */ + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted on AMD and NVidia drivers."); CORRADE_COMPARE(value.xyz(), Math::Vector3(315, 65201, 2576)); } @@ -1173,11 +1171,9 @@ void MeshGLTest::addVertexBufferMatrixMxNd() { MAGNUM_VERIFY_NO_GL_ERROR(); { - 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."); + /* Used to be a problem on Intel Windows drivers 23, not a problem on + 26 anymore */ + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::Amd|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted on AMD and NVidia drivers."); CORRADE_COMPARE(value.xyz(), Math::Vector3(315, 65201, 2576)); }