[dawn][opengl] Define G, B, A components of depth-stencil textures

CTS: gpuweb/cts#4427

Bug: 444702045
Change-Id: Idc1ccc5b68fdb8035d43815075668471af28af64
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/261054
Reviewed-by: Kai Ninomiya <[email protected]>
Commit-Queue: Fr <[email protected]>

Author: beaufortfrancois

src/dawn/native/CommandBufferStateTracker.cpp

@@ -270,6 +270,8 @@ Return FindStorageBufferBindingAliasing(const PipelineLayoutBase* pipelineLayout
 
 bool TextureViewsMatch(const TextureViewBase* a, const TextureViewBase* b) {
     DAWN_ASSERT(a->GetTexture() == b->GetTexture());
+    auto swizzleA = a->GetSwizzle();
+    auto swizzleB = b->GetSwizzle();
     // If the texture format is multiplanar, the view formats are permitted to differ (e.g., R8
     // and RG8), referring to different planes of the same YUV texture. This cannot happen in
     // OpenGL that actually needs the validation of texture views matching so it's safe for
@@ -281,10 +283,8 @@ bool TextureViewsMatch(const TextureViewBase* a, const TextureViewBase* b) {
            a->GetDimension() == b->GetDimension() && a->GetBaseMipLevel() == b->GetBaseMipLevel() &&
            a->GetLevelCount() == b->GetLevelCount() &&
            a->GetBaseArrayLayer() == b->GetBaseArrayLayer() &&
-           a->GetLayerCount() == b->GetLayerCount() && a->GetSwizzleRed() == b->GetSwizzleRed() &&
-           a->GetSwizzleGreen() == b->GetSwizzleGreen() &&
-           a->GetSwizzleBlue() == b->GetSwizzleBlue() &&
-           a->GetSwizzleAlpha() == b->GetSwizzleAlpha();
+           a->GetLayerCount() == b->GetLayerCount() && swizzleA.r == swizzleB.r &&
+           swizzleA.g == swizzleB.g && swizzleA.b == swizzleB.b && swizzleA.a == swizzleB.a;
 }
 
 using VectorOfTextureViews = absl::InlinedVector<const TextureViewBase*, 8>;

src/dawn/native/Texture.cpp

@@ -1920,22 +1920,6 @@ wgpu::TextureComponentSwizzle TextureViewBase::GetSwizzle() const {
     };
 }
 
-wgpu::ComponentSwizzle TextureViewBase::GetSwizzleRed() const {
-    return mSwizzleRed;
-}
-
-wgpu::ComponentSwizzle TextureViewBase::GetSwizzleGreen() const {
-    return mSwizzleGreen;
-}
-
-wgpu::ComponentSwizzle TextureViewBase::GetSwizzleBlue() const {
-    return mSwizzleBlue;
-}
-
-wgpu::ComponentSwizzle TextureViewBase::GetSwizzleAlpha() const {
-    return mSwizzleAlpha;
-}
-
 bool TextureViewBase::IsYCbCr() const {
     return false;
 }

src/dawn/native/Texture.h

@@ -371,10 +371,6 @@ class TextureViewBase : public ApiObjectBase {
     wgpu::TextureUsage GetInternalUsage() const;
 
     wgpu::TextureComponentSwizzle GetSwizzle() const;
-    wgpu::ComponentSwizzle GetSwizzleRed() const;
-    wgpu::ComponentSwizzle GetSwizzleGreen() const;
-    wgpu::ComponentSwizzle GetSwizzleBlue() const;
-    wgpu::ComponentSwizzle GetSwizzleAlpha() const;
 
     virtual bool IsYCbCr() const;
     // Valid to call only if `IsYCbCr()` is true.

src/dawn/native/d3d12/TextureD3D12.cpp

@@ -933,13 +933,7 @@ TextureView::TextureView(TextureBase* texture, const UnpackedPtr<TextureViewDesc
     mSrvDesc.Format =
         d3d::D3DShaderResourceViewFormat(GetDevice(), textureFormat, GetFormat(), aspects);
     if (mSrvDesc.Format != DXGI_FORMAT_UNKNOWN) {
-        wgpu::TextureComponentSwizzle swizzle = {
-            .r = GetSwizzleRed(),
-            .g = GetSwizzleGreen(),
-            .b = GetSwizzleBlue(),
-            .a = GetSwizzleAlpha(),
-        };
-
+        auto swizzle = GetSwizzle();
         // Stencil is accessed using the .g component in the shader.
         DXGI_FORMAT textureDxgiFormat = d3d::DXGITextureFormat(GetDevice(), textureFormat.format);
         if (d3d::IsDepthStencil(textureDxgiFormat) && aspects == Aspect::Stencil) {

src/dawn/native/opengl/CommandBufferGL.cpp

@@ -45,6 +45,7 @@
 #include "dawn/native/opengl/DeviceGL.h"
 #include "dawn/native/opengl/Forward.h"
 #include "dawn/native/opengl/PersistentPipelineStateGL.h"
+#include "dawn/native/opengl/PhysicalDeviceGL.h"
 #include "dawn/native/opengl/PipelineLayoutGL.h"
 #include "dawn/native/opengl/QuerySetGL.h"
 #include "dawn/native/opengl/RenderPipelineGL.h"
@@ -427,19 +428,21 @@ class BindGroupTracker : public BindGroupTrackerBase<false, uint64_t> {
                         DAWN_GL_TRY(
                             gl, TexParameteri(target, GL_TEXTURE_MAX_LEVEL,
                                               view->GetBaseMipLevel() + view->GetLevelCount() - 1));
-                        if (mPipelineLayout->GetDevice()->HasFeature(
-                                Feature::TextureComponentSwizzle)) {
+                        PhysicalDeviceBase* device =
+                            ToBackend(mPipelineLayout->GetDevice())->GetPhysicalDevice();
+                        if (ToBackend(device)->SupportTextureComponentSwizzle()) {
+                            wgpu::TextureComponentSwizzle swizzle = view->GetSwizzle();
+                            if (view->GetTexture()->GetFormat().HasDepthOrStencil()) {
+                                swizzle = ComposeSwizzle(kR001Swizzle, swizzle);
+                            }
                             DAWN_GL_TRY(gl, TexParameteri(target, GL_TEXTURE_SWIZZLE_R,
-                                                          ComponentSwizzle(view->GetSwizzleRed())));
-                            DAWN_GL_TRY(gl,
-                                        TexParameteri(target, GL_TEXTURE_SWIZZLE_G,
-                                                      ComponentSwizzle(view->GetSwizzleGreen())));
-                            DAWN_GL_TRY(gl,
-                                        TexParameteri(target, GL_TEXTURE_SWIZZLE_B,
-                                                      ComponentSwizzle(view->GetSwizzleBlue())));
-                            DAWN_GL_TRY(gl,
-                                        TexParameteri(target, GL_TEXTURE_SWIZZLE_A,
-                                                      ComponentSwizzle(view->GetSwizzleAlpha())));
+                                                          ComponentSwizzle(swizzle.r)));
+                            DAWN_GL_TRY(gl, TexParameteri(target, GL_TEXTURE_SWIZZLE_G,
+                                                          ComponentSwizzle(swizzle.g)));
+                            DAWN_GL_TRY(gl, TexParameteri(target, GL_TEXTURE_SWIZZLE_B,
+                                                          ComponentSwizzle(swizzle.b)));
+                            DAWN_GL_TRY(gl, TexParameteri(target, GL_TEXTURE_SWIZZLE_A,
+                                                          ComponentSwizzle(swizzle.a)));
                         }
                     }
 

src/dawn/native/opengl/PhysicalDeviceGL.cpp

@@ -91,6 +91,11 @@ uint32_t GetDeviceIdFromRender(std::string_view render) {
     return deviceId;
 }
 
+bool IsANGLED3D11(std::string_view renderer) {
+    return renderer.find("ANGLE") != std::string::npos &&
+           renderer.find("Direct3D11") != std::string::npos;
+}
+
 bool IsANGLEDesktopGL(std::string_view renderer) {
     return renderer.find("ANGLE") != std::string::npos &&
            renderer.find("OpenGL") != std::string::npos &&
@@ -302,7 +307,7 @@ void PhysicalDevice::InitializeSupportedFeaturesImpl() {
     }
 
     // TextureComponentSwizzle
-    if (mFunctions.IsAtLeastGLES(3, 0) || mFunctions.IsAtLeastGL(3, 3)) {
+    if (SupportTextureComponentSwizzle()) {
         EnableFeature(Feature::TextureComponentSwizzle);
     }
 }
@@ -572,4 +577,10 @@ FeatureValidationResult PhysicalDevice::ValidateFeatureSupportedWithTogglesImpl(
 
 void PhysicalDevice::PopulateBackendProperties(UnpackedPtr<AdapterInfo>& info) const {}
 
+bool PhysicalDevice::SupportTextureComponentSwizzle() const {
+    // Texture component swizzle requires GLES 3.0 / GL 3.3+ and is known to be incomplete or
+    // unsupported on the ANGLE D3D11 backend (as D3D11 lacks native support).
+    return (mFunctions.IsAtLeastGLES(3, 0) || mFunctions.IsAtLeastGL(3, 3)) && !IsANGLED3D11(mName);
+}
+
 }  // namespace dawn::native::opengl

src/dawn/native/opengl/PhysicalDeviceGL.h

@@ -57,6 +57,8 @@ class PhysicalDevice : public PhysicalDeviceBase {
         InstanceBase* instance,
         const Surface* surface) const override;
 
+    bool SupportTextureComponentSwizzle() const;
+
   private:
     PhysicalDevice(wgpu::BackendType backendType, Ref<DisplayEGL> display);
 

src/dawn/native/opengl/TextureGL.cpp

@@ -125,12 +125,13 @@ bool RequiresCreatingNewTextureView(
         return true;
     }
 
-    // TODO(414312052): Use TextureViewBase::UsesNonDefaultSwizzle() instead of
-    // textureViewDescriptor.
+    // TODO(414312052): We're doing a simple check against the default kRGBASwizzle, even though a
+    // more rigorous check against the implicitly inherited swizzle would be technically better.
+    // We're deferring that complexity because the simple check is "good enough" for now, and the
+    // issue is minimal (only affecting Desktop GL).
     if (auto* swizzleDesc = textureViewDescriptor.Get<TextureComponentSwizzleDescriptor>()) {
         auto swizzle = swizzleDesc->swizzle.WithTrivialFrontendDefaults();
-        if (swizzle.r != wgpu::ComponentSwizzle::R || swizzle.g != wgpu::ComponentSwizzle::G ||
-            swizzle.b != wgpu::ComponentSwizzle::B || swizzle.a != wgpu::ComponentSwizzle::A) {
+        if (!AreSwizzleEquivalent(*ToCppAPI(&swizzle), kRGBASwizzle)) {
             return true;
         }
     }

src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp

@@ -388,9 +388,9 @@ AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, }, "Metal_Intel_R__UHD_Graphics_630");
 AddDevice({0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, }, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat");
 AddDevice({0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, }, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat");
-AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, }, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_630__0x00009BC5__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_2127__compat");
+AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_630__0x00009BC5__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_2127__compat");
 AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, }, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_770__0x00004680__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_5333__compat");
-AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, }, "OpenGLES_ANGLE__NVIDIA__NVIDIA_GeForce_GTX_1660__0x00002184__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_15_4601__compat");
+AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, "OpenGLES_ANGLE__NVIDIA__NVIDIA_GeForce_GTX_1660__0x00002184__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_15_4601__compat");
 AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, }, "Vulkan_GeForce_GTX_1660");
 AddDevice({1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, }, "Vulkan_Intel_R__UHD_Graphics_630");
 AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, }, "Vulkan_Intel_R__UHD_Graphics_630__CML_GT2");