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/1184918Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Ignore D3D11 debug layer messages in multiview tests
4b4197af · Olli Etuaho · Commit Bot · 121d6c31 · 4b4197af
Commit 4b4197af authored Aug 22, 2018 by Olli Etuaho Committed by Commit Bot Aug 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

MultiviewDrawTest.cpp src/tests/gl_tests/MultiviewDrawTest.cpp +12 -3

No files found.
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
@@ -1079,7 +1079,10 @@ TEST_P(MultiviewRenderTest, AttribDivisor)

    // 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 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)

    // 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 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)

    // 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);