commit 4103d2271ca18310b5f5fcf2bc5d5029c6ebce66
author jchen10 <jie.a.chen@intel.com> Tue Jun 06 15:50:17 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 06 15:50:17 2023 +0000
tree efb03b2ca5d80ce7e46ed669cee2b785b62b7e77
parent 0a99719ad014347d96d3e76b5571370ef7dc1af8

d3d11: Enable DepthStencilCopyTests

Bug: dawn:1705

Change-Id: I045f6df6ee921cc61125b6ac15bec2b61fe497b1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/135920
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jie A Chen <jie.a.chen@intel.com>

src/dawn/tests/end2end/DepthStencilCopyTests.cpp

diff --git a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
index f45f7e5..895a7cd 100644
--- a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
+++ b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
@@ -1278,6 +1278,9 @@
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
 
+    // TODO(dawn:1848): support depth-stencil texture write on D3D11.
+    DAWN_SUPPRESS_TEST_IF(IsD3D11());
+
     // Create a stencil texture
     constexpr uint32_t kWidth = 4;
     constexpr uint32_t kHeight = 4;
@@ -1436,7 +1439,7 @@
 
 DAWN_INSTANTIATE_TEST_P(
     DepthStencilCopyTests,
-    {D3D12Backend(), MetalBackend(),
+    {D3D11Backend(), D3D12Backend(), MetalBackend(),
      MetalBackend({"use_blit_for_depth_texture_to_texture_copy_to_nonzero_subresource"}),
      MetalBackend({"use_blit_for_buffer_to_depth_texture_copy",
                    "use_blit_for_buffer_to_stencil_texture_copy"}),
@@ -1448,7 +1451,7 @@
 
 DAWN_INSTANTIATE_TEST_P(
     DepthCopyTests,
-    {D3D12Backend(),
+    {D3D11Backend(), D3D12Backend(),
      D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_"
                    "copy_with_non_zero_buffer_offset"}),
      MetalBackend(),
@@ -1458,7 +1461,7 @@
                                      kValidDepthCopyTextureFormats.end()));
 
 DAWN_INSTANTIATE_TEST_P(DepthCopyFromBufferTests,
-                        {D3D12Backend(),
+                        {D3D11Backend(), D3D12Backend(),
                          D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_"
                                        "copy_with_non_zero_buffer_offset"}),
                          MetalBackend(),
@@ -1469,7 +1472,7 @@
 
 DAWN_INSTANTIATE_TEST_P(
     StencilCopyTests,
-    {D3D12Backend(),
+    {D3D11Backend(), D3D12Backend(),
      D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_"
                    "copy_with_non_zero_buffer_offset"}),
      MetalBackend(), MetalBackend({"metal_use_combined_depth_stencil_format_for_stencil8"}),
@@ -1483,7 +1486,7 @@
 
 DAWN_INSTANTIATE_TEST_P(
     DepthStencilCopyTests_RegressionDawn1083,
-    {D3D12Backend(), MetalBackend(),
+    {D3D11Backend(), D3D12Backend(), MetalBackend(),
      MetalBackend({"use_blit_for_depth_texture_to_texture_copy_to_nonzero_subresource"}),
      OpenGLBackend(), OpenGLESBackend(), VulkanBackend()},
     std::vector<wgpu::TextureFormat>{wgpu::TextureFormat::Depth16Unorm,