Tighten workaround on unary minus for Intel D3D drivers

This driver bug has been fixed in 20.19.15.4624. BUG=chromium:644033 Change-Id: I6f621d7c4d4b823da29255f869af84097f4f7c2c Reviewed-on: https://chromium-review.googlesource.com/476118Reviewed-by: Yunchao He <yunchao.he@intel.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Tighten workaround on unary minus for Intel D3D drivers
331f6dbd · Jiawei-Shao · Commit Bot · 966c940b · 331f6dbd · 331f6dbd
Commit 331f6dbd authored Apr 13, 2017 by Jiawei-Shao Committed by Commit Bot Apr 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

WorkaroundsD3D.h include/platform/WorkaroundsD3D.h +1 -0

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

No files found.
--- a/include/platform/WorkaroundsD3D.h
+++ b/include/platform/WorkaroundsD3D.h
@@ -88,6 +88,7 @@ struct WorkaroundsD3D
    // On some Intel drivers, evaluating unary minus operator on integer may get wrong answer in
    // vertex shaders. To work around this bug, we translate -(int) into ~(int)+1.
+    // This driver bug is fixed in 20.19.15.4624.
    bool rewriteUnaryMinusOperator = false;
    // On some Intel drivers, using isnan() on highp float will get wrong answer. To work around

--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -2005,8 +2005,12 @@ angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps
                d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) <
                IntelDriverVersion(4542);
        }
-        workarounds.rewriteUnaryMinusOperator =
+        else if (IsBroadwell(adapterDesc.DeviceId) || IsHaswell(adapterDesc.DeviceId))
-            IsBroadwell(adapterDesc.DeviceId) || IsHaswell(adapterDesc.DeviceId);
+        {
+            workarounds.rewriteUnaryMinusOperator =
+                d3d11_gl::GetIntelDriverVersion(deviceCaps.driverVersion) <
+                IntelDriverVersion(4624);
+        }
    }
    // TODO(jmadill): Disable when we have a fixed driver version.