commit 4b4197afdd121cfd8db7711649ceae652d4e9317
author Olli Etuaho <oetuaho@nvidia.com> Wed Aug 22 15:24:41 2018 +0300
committer Commit Bot <commit-bot@chromium.org> Wed Aug 22 13:09:07 2018 +0000
tree 195cc35633db25d8f7a36be308d3136c5bfc376e
parent 121d6c31a11520fd4dbdde6d9d3bce8a10042f95

Ignore D3D11 debug layer messages in multiview tests

This is better than skipping the tests entirely. The debug layer
messages appear incorrect and may be specific to Windows 7 and
Windows Server 2008.

BUG=angleproject:2778
TEST=angle_end2end_tests on Windows Server 2008

Change-Id: Ief81fbe22f518c393a37a0969c8987ed9500fbed
Reviewed-on: https://chromium-review.googlesource.com/1184918
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/tests/gl_tests/MultiviewDrawTest.cpp

diff --git a/src/tests/gl_tests/MultiviewDrawTest.cpp b/src/tests/gl_tests/MultiviewDrawTest.cpp
index 0f32570..1e855c0 100644
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
@@ -1079,7 +1079,10 @@
 
     // Looks like an incorrect D3D debug layer message is generated on Windows AMD and NVIDIA.
     // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && (IsAMD() || IsNVIDIA()));
+    if (IsWindows() && IsD3D11())
+    {
+        ignoreD3D11SDKLayersWarnings();
+    }
 
     const std::string &vsSource =
         "#version 300 es\n"
@@ -1839,7 +1842,10 @@
 
     // Looks like an incorrect D3D debug layer message is generated on Windows AMD and NVIDIA.
     // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && (IsAMD() || IsNVIDIA()));
+    if (IsWindows() && IsD3D11())
+    {
+        ignoreD3D11SDKLayersWarnings();
+    }
 
     const int kViewWidth  = 4;
     const int kViewHeight = 1;
@@ -1979,7 +1985,10 @@
 
     // Looks like an incorrect D3D debug layer message is generated on Windows / AMD.
     // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && IsAMD());
+    if (IsWindows() && IsD3D11())
+    {
+        ignoreD3D11SDKLayersWarnings();
+    }
 
     GLVertexArray vao;
     glBindVertexArray(vao);