Commit 28394c22 by Yuly Novikov Committed by Commit Bot

Revert "Temporarily disable creating D3D debug device."

This reverts commit 3d544fff. Reason for revert: Seems like flakiness is not related. Suppress D3D11 test failures uncovered by re-enabling D3D debug device: ComputeShaderTest.DispatchCompute Texture2DTestES3.TextureImplPropogatesDirtyBits D3DTextureTestMS.* Also a small fix to ANGLETestBase::checkD3D11SDKLayersMessages to clear reported messages, otherwise the failures are also reported for tests following the one with the actual failure. Original change's description: > Temporarily disable creating D3D debug device. > > To diagnose whether Windows Intel end2end tests flakiness > is related to creating debug device and new version of Windows SDK. > > Bug: angleproject:3153 > Change-Id: Ica7eae3fe875e22203b6dfd98b83604d66a97737 > Reviewed-on: https://chromium-review.googlesource.com/c/1476954 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Bug: angleproject:3153, angleproject:3493 Bug: angleproject:3501, angleproject:3512, angleproject:3513 Change-Id: I232da72aa09c2b9230cf179dd54e1731f8365f8e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1480854Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent f1a40a84
...@@ -513,7 +513,7 @@ Renderer11::Renderer11(egl::Display *display) ...@@ -513,7 +513,7 @@ Renderer11::Renderer11(egl::Display *display)
UNREACHABLE(); UNREACHABLE();
} }
mCreateDebugDevice = false; mCreateDebugDevice = ShouldUseDebugLayers(attributes);
} }
else if (mDisplay->getPlatform() == EGL_PLATFORM_DEVICE_EXT) else if (mDisplay->getPlatform() == EGL_PLATFORM_DEVICE_EXT)
{ {
......
...@@ -365,6 +365,9 @@ void main() ...@@ -365,6 +365,9 @@ void main()
// Use glDispatchCompute to define work group count. // Use glDispatchCompute to define work group count.
TEST_P(ComputeShaderTest, DispatchCompute) TEST_P(ComputeShaderTest, DispatchCompute)
{ {
// D3D Debug device reports an error. http://anglebug.com/3512
ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11());
constexpr char kCS[] = R"(#version 310 es constexpr char kCS[] = R"(#version 310 es
layout(local_size_x=4, local_size_y=3, local_size_z=2) in; layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
layout(rgba32ui) uniform highp writeonly uimage2D imageOut; layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
......
...@@ -1200,5 +1200,6 @@ TEST_P(D3DTextureTestMS, CopyTexSubImage2DTest) ...@@ -1200,5 +1200,6 @@ TEST_P(D3DTextureTestMS, CopyTexSubImage2DTest)
// tests should be run against. // tests should be run against.
ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN()); ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(D3DTextureTestES3, ES3_D3D11(), ES3_OPENGL()); ANGLE_INSTANTIATE_TEST(D3DTextureTestES3, ES3_D3D11(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11()); // D3D Debug device reports an error. http://anglebug.com/3513
// ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11());
} // namespace angle } // namespace angle
...@@ -1936,6 +1936,8 @@ TEST_P(Texture2DTestES3, TextureImplPropogatesDirtyBits) ...@@ -1936,6 +1936,8 @@ TEST_P(Texture2DTestES3, TextureImplPropogatesDirtyBits)
ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL()); ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL());
// Flaky hangs on Win10 AMD RX 550 GL. http://anglebug.com/3371 // Flaky hangs on Win10 AMD RX 550 GL. http://anglebug.com/3371
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsOpenGL()); ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsOpenGL());
// D3D Debug device reports an error. http://anglebug.com/3501
ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11());
// The workaround in the GL backend required to trigger this bug generates driver warning // The workaround in the GL backend required to trigger this bug generates driver warning
// messages. // messages.
......
...@@ -1057,6 +1057,7 @@ void ANGLETestBase::checkD3D11SDKLayersMessages() ...@@ -1057,6 +1057,7 @@ void ANGLETestBase::checkD3D11SDKLayersMessages()
free(pMessage); free(pMessage);
} }
} }
infoQueue->ClearStoredMessages();
FAIL() << numStoredD3DDebugMessages FAIL() << numStoredD3DDebugMessages
<< " D3D11 SDK Layers message(s) detected! Test Failed.\n"; << " D3D11 SDK Layers message(s) detected! Test Failed.\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment