commit 188e3710f3993a578c307f542e33a4018d557d0e
author Zhaoming Jiang <zhaoming.jiang@microsoft.com> Tue May 13 11:52:48 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 13 11:52:48 2025 -0700
tree 84140d1f45cfa880ecdf4aaa9628403b7f9e07fb
parent 2aef4f44066ec8dc02eef82f59bffa1f1bb7a396

Dawn E2E: Test all depth texture format with use_packed_depth24_unorm_stencil8_format enabled

This CL make DepthStencil[Copy/LoadOp/Sampling]Test and DepthBiasTests
tests all texture formats regardless of toggle
use_packed_depth24_unorm_stencil8_format. This CL also make
DepthBiasTests tests run with and without the toggle enabled.

Bug: 417251441
Change-Id: Ifa59d7561fecd829227fc910a97bcaf0bd5690f6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/241734
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Zhaoming Jiang <zhaoming.jiang@microsoft.com>
Reviewed-by: Shrek Shao <shrekshao@google.com>

src/dawn/tests/end2end/DepthBiasTests.cpp

diff --git a/src/dawn/tests/end2end/DepthBiasTests.cpp b/src/dawn/tests/end2end/DepthBiasTests.cpp
index abdd618..1d20955 100644
--- a/src/dawn/tests/end2end/DepthBiasTests.cpp
+++ b/src/dawn/tests/end2end/DepthBiasTests.cpp
@@ -50,11 +50,6 @@
                           int32_t bias,
                           float biasSlopeScale,
                           float biasClamp) {
-        // Skip formats other than Depth24PlusStencil8 if we're specifically testing with the packed
-        // depth24_unorm_stencil8 toggle.
-        DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("use_packed_depth24_unorm_stencil8_format") &&
-                                 depthFormat != wgpu::TextureFormat::Depth24PlusStencil8);
-
         const char* vertexSource = nullptr;
         switch (quadAngle) {
             case QuadAngle::Flat:
@@ -338,7 +333,9 @@
 
 DAWN_INSTANTIATE_TEST(DepthBiasTests,
                       D3D11Backend(),
+                      D3D11Backend({"use_packed_depth24_unorm_stencil8_format"}),
                       D3D12Backend(),
+                      D3D12Backend({"use_packed_depth24_unorm_stencil8_format"}),
                       MetalBackend(),
                       OpenGLBackend(),
                       OpenGLESBackend(),

src/dawn/tests/end2end/DepthStencilCopyTests.cpp

diff --git a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
index cba5679..df633d5 100644
--- a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
+++ b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
@@ -111,12 +111,6 @@
 
         DAWN_TEST_UNSUPPORTED_IF(!mIsFormatSupported);
 
-        // Skip formats other than Depth24PlusStencil8 if we're specifically testing with the packed
-        // depth24_unorm_stencil8 toggle.
-        DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("use_packed_depth24_unorm_stencil8_format") &&
-                                 GetParam().mTextureFormat !=
-                                     wgpu::TextureFormat::Depth24PlusStencil8);
-
         // Draw a square in the bottom left quarter of the screen.
         mVertexModule = utils::CreateShaderModule(device, R"(
             @vertex

src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp

diff --git a/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp b/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp
index 36e3c4f..42459cc 100644
--- a/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp
+++ b/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp
@@ -80,11 +80,6 @@
 
         DAWN_TEST_UNSUPPORTED_IF(!mIsFormatSupported);
 
-        // Skip formats other than Depth24PlusStencil8 if we're specifically testing with the packed
-        // depth24_unorm_stencil8 toggle.
-        DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("use_packed_depth24_unorm_stencil8_format") &&
-                                 GetParam().mFormat != wgpu::TextureFormat::Depth24PlusStencil8);
-
         wgpu::TextureDescriptor descriptor;
         descriptor.size = {kRTSize, kRTSize};
         descriptor.format = GetParam().mFormat;

src/dawn/tests/end2end/DepthStencilSamplingTests.cpp

diff --git a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp
index 14a1822..30abaf9 100644
--- a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp
+++ b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp
@@ -75,12 +75,6 @@
 
         DAWN_TEST_UNSUPPORTED_IF(!mIsFormatSupported);
 
-        // Skip formats other than Depth24PlusStencil8 if we're specifically testing with the packed
-        // depth24_unorm_stencil8 toggle.
-        DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("use_packed_depth24_unorm_stencil8_format") &&
-                                 GetParam().mTextureFormat !=
-                                     wgpu::TextureFormat::Depth24PlusStencil8);
-
         wgpu::BufferDescriptor uniformBufferDesc;
         uniformBufferDesc.usage = wgpu::BufferUsage::Uniform | wgpu::BufferUsage::CopyDst;
         uniformBufferDesc.size = sizeof(float);