Revert "Remove skipping of groupMemoryBarrierAndBarrierTest on NVIDIA"

This reverts commit aac491fc. Reason for revert: This test is still failing on the Win7 NVIDIA bots: https://ci.chromium.org/p/chromium/builders/ci/Win7%20FYI%20Release%20%28NVIDIA%29/6206 https://ci.chromium.org/p/chromium/builders/ci/Win7%20FYI%20x64%20Release%20%28NVIDIA%29/6261 Original change's description: > Remove skipping of groupMemoryBarrierAndBarrierTest on NVIDIA > > Remove skipping of groupMemoryBarrierAndBarrierTest on NVIDIA. > > BUG=angleproject:2280 > > Change-Id: I9ea72939cd0f828295bb694c9d3515ef554c9a36 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1763948 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> TBR=kkinnunen@nvidia.com,jmadill@chromium.org,svaisanen@nvidia.com Change-Id: Ib7802e66b68419f7aa3dabf3a308811d36c52ff2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:2280 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1769076Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>

Revert "Remove skipping of groupMemoryBarrierAndBarrierTest on NVIDIA"
a9389dfe · Jonah Ryan-Davis · Commit Bot · d6c7fec1 · a9389dfe
Commit a9389dfe authored Aug 23, 2019 by Jonah Ryan-Davis Committed by Commit Bot Aug 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ComputeShaderTest.cpp src/tests/gl_tests/ComputeShaderTest.cpp +1 -1

No files found.
--- a/src/tests/gl_tests/ComputeShaderTest.cpp
+++ b/src/tests/gl_tests/ComputeShaderTest.cpp
@@ -1716,7 +1716,7 @@ TEST_P(ComputeShaderTest, groupMemoryBarrierAndBarrierTest)
    // TODO(xinghua.cao@intel.com): Figure out why we get this error message
    // that shader uses features not recognized by this D3D version.
-    ANGLE_SKIP_TEST_IF(IsAMD() && IsD3D11());
+    ANGLE_SKIP_TEST_IF((IsAMD() || IsNVIDIA()) && IsD3D11());
    GLTexture texture;
    GLFramebuffer framebuffer;