Bug 1976960 - feat(webgpu): allow GPUTextures where GPUTextureViews are allowed r=#webgpu-reviewers!

Changed in spec. upstream by [gpuweb#5228](gpuweb/gpuweb#5228), tested by CTS in [gpuweb/cts#4407](gpuweb/cts#4407) (which is what caused the `FAIL`s removed here to be introduced with bug 1976874).

Differential Revision: https://phabricator.services.mozilla.com/D257054

Author: ErichDonGubler

dom/webgpu/CommandEncoder.cpp

@@ -12,6 +12,7 @@
 #include "ComputePassEncoder.h"
 #include "Device.h"
 #include "RenderPassEncoder.h"
+#include "TextureView.h"
 #include "Utility.h"
 #include "mozilla/webgpu/CanvasContext.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
@@ -222,9 +223,29 @@ already_AddRefed<RenderPassEncoder> CommandEncoder::BeginRenderPass(
   dom::GPURenderPassDescriptor desc{aDesc};
 
   for (auto& at : desc.mColorAttachments) {
-    TrackPresentationContext(at.mView->GetTargetContext());
+    auto coerceToViewInPlace =
+        [](dom::OwningGPUTextureOrGPUTextureView& texOrView)
+        -> RefPtr<TextureView> {
+      RefPtr<TextureView> view;
+      switch (texOrView.GetType()) {
+        case dom::OwningGPUTextureOrGPUTextureView::Type::eGPUTexture: {
+          dom::GPUTextureViewDescriptor defaultDesc{};
+          RefPtr<Texture> tex = texOrView.GetAsGPUTexture();
+          texOrView.SetAsGPUTextureView() = tex->CreateView(defaultDesc);
+          break;
+        }
+
+        case dom::OwningGPUTextureOrGPUTextureView::Type::eGPUTextureView:
+          // Nothing to do, great!
+          break;
+      }
+      view = texOrView.GetAsGPUTextureView();
+      return view;
+    };
+    TrackPresentationContext(coerceToViewInPlace(at.mView)->GetTargetContext());
     if (at.mResolveTarget.WasPassed()) {
-      TrackPresentationContext(at.mResolveTarget.Value().GetTargetContext());
+      TrackPresentationContext(
+          coerceToViewInPlace(at.mResolveTarget.Value())->GetTargetContext());
     }
   }
 

dom/webgpu/Device.cpp

@@ -462,6 +462,11 @@ already_AddRefed<BindGroup> Device::CreateBindGroup(
       e.buffer = bufBinding.mBuffer->mId;
       e.offset = bufBinding.mOffset;
       e.size = bufBinding.mSize.WasPassed() ? bufBinding.mSize.Value() : 0;
+    } else if (entry.mResource.IsGPUTexture()) {
+      auto texture = entry.mResource.GetAsGPUTexture();
+      const dom::GPUTextureViewDescriptor defaultDesc{};
+      RefPtr<TextureView> texture_view = texture->CreateView(defaultDesc);
+      setTextureViewBinding(*texture_view);
     } else if (entry.mResource.IsGPUTextureView()) {
       auto texture_view = entry.mResource.GetAsGPUTextureView();
       setTextureViewBinding(texture_view);

dom/webgpu/RenderPassEncoder.cpp

@@ -9,6 +9,7 @@
 #include "CommandEncoder.h"
 #include "RenderBundle.h"
 #include "RenderPipeline.h"
+#include "TextureView.h"
 #include "Utility.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
 #include "ipc/WebGPUChild.h"
@@ -86,7 +87,8 @@ ffi::WGPURecordedRenderPass* BeginRenderPass(
   ffi::WGPURenderPassDepthStencilAttachment dsDesc = {};
   if (aDesc.mDepthStencilAttachment.WasPassed()) {
     const auto& dsa = aDesc.mDepthStencilAttachment.Value();
-    dsDesc.view = dsa.mView->mId;
+    // NOTE: We're assuming callers reified this to be a view.
+    dsDesc.view = dsa.mView.GetAsGPUTextureView()->mId;
 
     // -
 
@@ -168,7 +170,8 @@ ffi::WGPURecordedRenderPass* BeginRenderPass(
 
   for (const auto& ca : aDesc.mColorAttachments) {
     ffi::WGPUFfiRenderPassColorAttachment cd = {};
-    cd.view = ca.mView->mId;
+    // NOTE: We're assuming callers reified this to be a view.
+    cd.view = ca.mView.GetAsGPUTextureView()->mId;
     cd.store_op = ConvertStoreOp(ca.mStoreOp);
 
     if (ca.mDepthSlice.WasPassed()) {
@@ -178,7 +181,8 @@ ffi::WGPURecordedRenderPass* BeginRenderPass(
       cd.depth_slice.tag = ffi::WGPUFfiOption_u32_None_u32;
     }
     if (ca.mResolveTarget.WasPassed()) {
-      cd.resolve_target = ca.mResolveTarget.Value().mId;
+      // NOTE: We're assuming callers reified this to be a view.
+      cd.resolve_target = ca.mResolveTarget.Value().GetAsGPUTextureView()->mId;
     }
 
     switch (ca.mLoadOp) {
@@ -222,12 +226,15 @@ RenderPassEncoder::RenderPassEncoder(CommandEncoder* const aParent,
     return;
   }
 
+  // NOTE: We depend on callers ensuring that texture-or-view fields are reified
+  // to views.
+
   for (const auto& at : aDesc.mColorAttachments) {
-    mUsedTextureViews.AppendElement(at.mView);
+    mUsedTextureViews.AppendElement(at.mView.GetAsGPUTextureView());
   }
   if (aDesc.mDepthStencilAttachment.WasPassed()) {
     mUsedTextureViews.AppendElement(
-        aDesc.mDepthStencilAttachment.Value().mView);
+        aDesc.mDepthStencilAttachment.Value().mView.GetAsGPUTextureView());
   }
 }
 

dom/webidl/WebGPU.webidl

@@ -594,6 +594,7 @@ dictionary GPUBindGroupDescriptor
 };
 
 typedef (GPUSampler or
+         GPUTexture or
          GPUTextureView or
          GPUBufferBinding) GPUBindingResource;
 
@@ -1116,17 +1117,17 @@ dictionary GPURenderPassDescriptor
 };
 
 dictionary GPURenderPassColorAttachment {
-    required GPUTextureView view;
+    required (GPUTexture or GPUTextureView) view;
     GPUIntegerCoordinate depthSlice;
-    GPUTextureView resolveTarget;
+    (GPUTexture or GPUTextureView) resolveTarget;
 
     GPUColor clearValue;
     required GPULoadOp loadOp;
     required GPUStoreOp storeOp;
 };
 
 dictionary GPURenderPassDepthStencilAttachment {
-    required GPUTextureView view;
+    required (GPUTexture or GPUTextureView) view;
 
     float depthClearValue;
     GPULoadOp depthLoadOp;

testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/render_pass/resolve/cts.https.html.ini

@@ -1,14 +1,6 @@
 [cts.https.html?q=webgpu:api,validation,render_pass,resolve:resolve_attachment:*]
-  implementation-status:
-    if os == "win": backlog
-    if os == "linux": backlog
   [:]
 
-  [:bindTextureResource=true]
-    expected:
-      if os == "win": FAIL
-      if os == "linux": FAIL
-
   [:colorAttachmentFormat="bgra8unorm"]
 
   [:colorAttachmentFormat="rgba8unorm-srgb"]