Skip RedefineBufferInUse Vulkan test on Win/Intel.

Also cleans up GenerateWorkarounds a bit for D3D11. BUG=angleproject:2221 Change-Id: I01667f850051045006d3439406aac3f4d094a374 Reviewed-on: https://chromium-review.googlesource.com/754915Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Skip RedefineBufferInUse Vulkan test on Win/Intel.
5b09d90d · Jamie Madill · Commit Bot · a579ded1 · 5b09d90d · 5b09d90d
Commit 5b09d90d authored Nov 06, 2017 by Jamie Madill Committed by Commit Bot Nov 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 11 deletions

renderer11_utils.cpp src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp +6 -11

StateChangeTest.cpp src/tests/gl_tests/StateChangeTest.cpp +3 -0

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -2130,24 +2130,19 @@ angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps
    if (IsIntel(adapterDesc.VendorId))
    {
+        IntelDriverVersion capsVersion = d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion);
        workarounds.preAddTexelFetchOffsets           = true;
        workarounds.useSystemMemoryForConstantBuffers = true;
-        workarounds.disableB5G6R5Support =
+        workarounds.disableB5G6R5Support              = capsVersion < IntelDriverVersion(4539);
-            d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) < IntelDriverVersion(4539);
        if (IsSkylake(adapterDesc.DeviceId))
        {
-            workarounds.callClearTwice =
+            workarounds.callClearTwice    = capsVersion < IntelDriverVersion(4771);
-                d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) <
+            workarounds.emulateIsnanFloat = capsVersion < IntelDriverVersion(4542);
-                IntelDriverVersion(4771);
-            workarounds.emulateIsnanFloat =
-                d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) <
-                IntelDriverVersion(4542);
        }
        else if (IsBroadwell(adapterDesc.DeviceId) || IsHaswell(adapterDesc.DeviceId))
        {
-            workarounds.rewriteUnaryMinusOperator =
+            workarounds.rewriteUnaryMinusOperator = capsVersion < IntelDriverVersion(4624);
-                d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) <
-                IntelDriverVersion(4624);
        }
    }

--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -819,6 +819,9 @@ TEST_P(SimpleStateChangeTest, DeleteBufferInUse)
 // Tests that resizing a Buffer during a draw works as expected.
 TEST_P(SimpleStateChangeTest, RedefineBufferInUse)
 {
+    // See http://anglebug.com/2221
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
    std::vector<GLColor> redColorData(6, GLColor::red);
    GLBuffer buffer;