commit c686d16af5a49bfbc96f7e7c3f4c36f50bd8beb9
author jchen10 <jie.a.chen@intel.com> Wed Jun 14 09:18:28 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 14 09:18:28 2023 +0000
tree 00e9bd368c1d1a98f952e4db58ebf5b76a2e1fbb
parent 364c0deabb1c8c8aa1ddaec646eaffc614f65ed4

d3d11: Fix texture format view reinterpretation

Bug: dawn:1810
Bug: dawn:1705

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

src/dawn/native/d3d11/TextureD3D11.cpp

diff --git a/src/dawn/native/d3d11/TextureD3D11.cpp b/src/dawn/native/d3d11/TextureD3D11.cpp
index 1c5b975..ed6c981 100644
--- a/src/dawn/native/d3d11/TextureD3D11.cpp
+++ b/src/dawn/native/d3d11/TextureD3D11.cpp
@@ -197,6 +197,8 @@
     // To sample from a depth or stencil texture, we need to create a typeless texture.
     bool needsTypelessFormat =
         GetFormat().HasDepthOrStencil() && (GetUsage() & wgpu::TextureUsage::TextureBinding);
+    // We need to use the typeless format if view format reinterpretation is required.
+    needsTypelessFormat |= GetViewFormats().any();
     desc.Format = needsTypelessFormat ? d3d::DXGITypelessTextureFormat(GetFormat().format)
                                       : d3d::DXGITextureFormat(GetFormat().format);
     desc.Usage = mIsStaging ? D3D11_USAGE_STAGING : D3D11_USAGE_DEFAULT;

src/dawn/tests/end2end/TextureViewTests.cpp

diff --git a/src/dawn/tests/end2end/TextureViewTests.cpp b/src/dawn/tests/end2end/TextureViewTests.cpp
index e2e918b..68174bf 100644
--- a/src/dawn/tests/end2end/TextureViewTests.cpp
+++ b/src/dawn/tests/end2end/TextureViewTests.cpp
@@ -442,9 +442,6 @@
     // TODO(crbug.com/dawn/1360): OpenGLES doesn't support view format reinterpretation.
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
 
-    // TODO(dawn:1810): D3D11 doesn't support view format reinterpretation.
-    DAWN_SUPPRESS_TEST_IF(IsD3D11());
-
     wgpu::TextureViewDescriptor viewDesc = {};
     viewDesc.format = wgpu::TextureFormat::RGBA8UnormSrgb;
 
@@ -776,9 +773,6 @@
     // TODO(crbug.com/dawn/1360): OpenGLES doesn't support view format reinterpretation.
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
 
-    // TODO(dawn:1810): D3D11 doesn't support view format reinterpretation.
-    DAWN_SUPPRESS_TEST_IF(IsD3D11());
-
     // Test will render into an SRGB view
     wgpu::TextureViewDescriptor viewDesc = {};
     viewDesc.format = wgpu::TextureFormat::RGBA8UnormSrgb;
@@ -885,9 +879,6 @@
     // TODO(crbug.com/dawn/1360): OpenGLES doesn't support view format reinterpretation.
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
 
-    // TODO(dawn:1810): D3D11 doesn't support view format reinterpretation.
-    DAWN_SUPPRESS_TEST_IF(IsD3D11());
-
     // Test will resolve into an SRGB view
     wgpu::TextureViewDescriptor viewDesc = {};
     viewDesc.format = wgpu::TextureFormat::RGBA8UnormSrgb;