Fail any ANGLE test if it outputs D3D11 SDK message in debug mode
Also:
- Disable some Feature Level 9_3 tests that trigger SDK messages
- Fix a debug object name issue. If you try to assign a debug name
to an object twice then you get an SDK warning message. This can
occur if you 'create' two objects (e.g. Rasterizer States) with
identical DESCs on the same device, since D3D11 can optimize
this and return the same object both times.
- Disable the message checks in Line Loops tests, since the tests
trigger incorrect D3D11 SDK messages on Win7 machines
BUG=angleproject:667;angleproject:1282
Change-Id: I7284fb3a11377afde24e0014e21dbcea80ebb126
Reviewed-on: https://chromium-review.googlesource.com/321393
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tryjob-Request: Austin Kinross <aukinros@microsoft.com>
Tested-by: Austin Kinross <aukinros@microsoft.com>
diff --git a/src/tests/gl_tests/LineLoopTest.cpp b/src/tests/gl_tests/LineLoopTest.cpp
index 383ec51..df8c1fa 100644
--- a/src/tests/gl_tests/LineLoopTest.cpp
+++ b/src/tests/gl_tests/LineLoopTest.cpp
@@ -134,12 +134,20 @@
TEST_P(LineLoopTest, LineLoopUByteIndices)
{
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ // On Win7, the D3D SDK Layers emits a false warning for these tests.
+ // This doesn't occur on Windows 10 (Version 1511) though.
+ ignoreD3D11SDKLayersWarnings();
+
static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
runTest(GL_UNSIGNED_BYTE, 0, indices + 1);
}
TEST_P(LineLoopTest, LineLoopUShortIndices)
{
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ ignoreD3D11SDKLayersWarnings();
+
static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
runTest(GL_UNSIGNED_SHORT, 0, indices + 1);
}
@@ -151,12 +159,18 @@
return;
}
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ ignoreD3D11SDKLayersWarnings();
+
static const GLuint indices[] = { 0, 7, 6, 9, 8, 0 };
runTest(GL_UNSIGNED_INT, 0, indices + 1);
}
TEST_P(LineLoopTest, LineLoopUByteIndexBuffer)
{
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ ignoreD3D11SDKLayersWarnings();
+
static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
GLuint buf;
@@ -171,6 +185,9 @@
TEST_P(LineLoopTest, LineLoopUShortIndexBuffer)
{
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ ignoreD3D11SDKLayersWarnings();
+
static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
GLuint buf;
@@ -190,6 +207,9 @@
return;
}
+ // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
+ ignoreD3D11SDKLayersWarnings();
+
static const GLuint indices[] = { 0, 7, 6, 9, 8, 0 };
GLuint buf;