Merge branch 'gfx-rs:trunk' into push-qxmkopzptsyq

Author: andyleiserson

.github/workflows/ci.yml

@@ -691,7 +691,7 @@ jobs:
         run: taplo format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/[email protected].2
+        uses: crate-ci/[email protected].3
 
   check-cts-runner:
     # runtime is normally 2 minutes

CHANGELOG.md

@@ -200,6 +200,8 @@ By @cwfitzgerald in [#8162](https://github.com/gfx-rs/wgpu/pull/8162).
 - **BREAKING**: Previously the WGSL storage-texture format `rg11b10float` was incorrectly accepted and generated by naga, but now only accepts the the correct name `rg11b10ufloat` instead. By @ErikWDev in [#8219](https://github.com/gfx-rs/wgpu/pull/8219).
 - The [`source()`](https://doc.rust-lang.org/std/error/trait.Error.html#method.source) method of `ShaderError` no longer reports the error as its own source. By @andyleiserson in [#8258](https://github.com/gfx-rs/wgpu/pull/8258).
 - naga correctly ingests SPIR-V that use descriptor runtime indexing, which in turn is correctly converted into WGSLs binding array. By @hasenbanck in [8256](https://github.com/gfx-rs/wgpu/pull/8256).
+- naga correctly ingests SPIR-V that loads from multi-sampled textures, which in turn is correctly converted into WGSLs texture_multisampled_2d and load operations. By @hasenbanck in [8270](https://github.com/gfx-rs/wgpu/pull/8270).
+- naga implement OpImageGather and OpImageDrefGather operations when ingesting SPIR-V. By @hasenbanck in [8280](https://github.com/gfx-rs/wgpu/pull/8280).
 
 #### DX12
 
@@ -214,12 +216,17 @@ By @cwfitzgerald in [#8162](https://github.com/gfx-rs/wgpu/pull/8162).
 
 #### DX12
 
+- Create an event per wait to prevent 60 second hangs in certain multithreaded scenarios. By @Vecvec in [#8273](https://github.com/gfx-rs/wgpu/pull/8273).
 - Fixed a bug where access to matrices with 2 rows would not work in some cases. By @andyleiserson in [#7438](https://github.com/gfx-rs/wgpu/pull/7438).
 
 ##### EGL
 
 - Fixed unwrap failed in context creation for some Android devices. By @uael in [#8024](https://github.com/gfx-rs/wgpu/pull/8024).
 
+##### Vulkan
+
+- Fixed wrong color format+space being reported versus what is hardcoded in `create_swapchain()`. By @MarijnS95 in [#8226](https://github.com/gfx-rs/wgpu/pull/8226).
+
 #### naga
 
 - [wgsl-in] Allow a trailing comma in `@blend_src(…)` attributes. By @ErichDonGubler in [#8137](https://github.com/gfx-rs/wgpu/pull/8137).

cts_runner/revision.txt

@@ -1 +1 @@
-81bfec725ae101551cc29f5f028c968b19c14467
+5e7bd6ed86201123ff6b0900974587550afb10e7

cts_runner/test.lst

@@ -3,6 +3,7 @@
 // cargo xtask cts -- --list <selector>
 // ```
 unittests:*
+webgpu:api,operation,buffers,createBindGroup:buffer_binding_resource:*
 webgpu:api,operation,command_buffer,basic:*
 webgpu:api,operation,command_buffer,copyBufferToBuffer:*
 fails-if(vulkan) webgpu:api,operation,command_buffer,copyTextureToTexture:copy_depth_stencil:format="depth24plus"
@@ -18,10 +19,13 @@ webgpu:api,operation,compute,basic:memcpy:*
 webgpu:api,operation,compute_pipeline,overrides:*
 webgpu:api,operation,device,lost:*
 webgpu:api,operation,render_pass,storeOp:*
+fails-if(vulkan) webgpu:api,operation,vertex_state,correctness:array_stride_zero:*
 // Presumably vertex pulling, revisit after https://github.com/gfx-rs/wgpu/issues/7981 is fixed.
 fails-if(metal) webgpu:api,operation,vertex_state,correctness:setVertexBuffer_offset_and_attribute_offset:*
 fails-if(dx12) webgpu:api,validation,capability_checks,limits,maxBindGroups:setBindGroup,*
 webgpu:api,validation,createBindGroup:buffer,effective_buffer_binding_size:*
+// Fails because we coerce a size of 0 in `GPUDevice.createBindGroup(…)` to `buffer.size - offset`.
+// FAIL webgpu:api,validation,createBindGroup:buffer_offset_and_size_for_bind_groups_match:*
 webgpu:api,validation,encoding,beginComputePass:*
 webgpu:api,validation,encoding,beginRenderPass:*
 webgpu:api,validation,encoding,cmds,clearBuffer:*
@@ -106,14 +110,12 @@ webgpu:api,validation,image_copy,layout_related:copy_end_overflows_u64:*
 fails-if(dx12) webgpu:api,validation,image_copy,layout_related:offset_alignment:*
 webgpu:api,validation,image_copy,texture_related:format:dimension="1d";*
 webgpu:api,validation,queue,submit:command_buffer,*
-// `GPUTexture` as `GPUTextureView` not supported by Deno. https://github.com/gfx-rs/wgpu/issues/8200
-//FAIL: webgpu:api,validation,render_pass,render_pass_descriptor:attachments,one_color_attachment:
-//FAIL: webgpu:api,validation,render_pass,render_pass_descriptor:attachments,one_depth_stencil_attachment:
-webgpu:api,validation,render_pass,render_pass_descriptor:attachments,same_size:
-webgpu:api,validation,render_pass,render_pass_descriptor:attachments,color_depth_mismatch:
-webgpu:api,validation,render_pass,render_pass_descriptor:attachments,layer_count:*
-webgpu:api,validation,render_pass,render_pass_descriptor:attachments,mip_level_count:*
+webgpu:api,validation,render_pass,render_pass_descriptor:attachments,*
+webgpu:api,validation,render_pass,render_pass_descriptor:color_attachments,depthSlice,bound_check:*
+// Fails due to missing validation.
+// FAIL: webgpu:api,validation,render_pass,render_pass_descriptor:color_attachments,depthSlice,overlaps,diff_miplevel:*
 webgpu:api,validation,render_pass,render_pass_descriptor:resolveTarget,*
+webgpu:api,validation,render_pass,resolve:resolve_attachment:*
 webgpu:api,validation,texture,rg11b10ufloat_renderable:*
 webgpu:api,operation,render_pipeline,overrides:*
 webgpu:api,operation,rendering,basic:clear:*

deno_webgpu/bind_group.rs

@@ -17,6 +17,7 @@ use deno_core::WebIDL;
 use crate::buffer::GPUBuffer;
 use crate::error::GPUGenericError;
 use crate::sampler::GPUSampler;
+use crate::texture::GPUTexture;
 use crate::texture::GPUTextureView;
 use crate::Instance;
 
@@ -93,7 +94,9 @@ pub(crate) struct GPUBufferBinding {
 
 pub(crate) enum GPUBindingResource {
   Sampler(Ptr<GPUSampler>),
+  Texture(Ptr<GPUTexture>),
   TextureView(Ptr<GPUTextureView>),
+  Buffer(Ptr<GPUBuffer>),
   BufferBinding(GPUBufferBinding),
 }
 
@@ -115,6 +118,16 @@ impl<'a> WebIdlConverter<'a> for GPUBindingResource {
       options,
     )
     .map(Self::Sampler)
+    .or_else(|_| {
+      <Ptr<GPUTexture>>::convert(
+        scope,
+        value,
+        prefix.clone(),
+        context.borrowed(),
+        options,
+      )
+      .map(Self::Texture)
+    })
     .or_else(|_| {
       <Ptr<GPUTextureView>>::convert(
         scope,
@@ -125,6 +138,16 @@ impl<'a> WebIdlConverter<'a> for GPUBindingResource {
       )
       .map(Self::TextureView)
     })
+    .or_else(|_| {
+      <Ptr<GPUBuffer>>::convert(
+        scope,
+        value,
+        prefix.clone(),
+        context.borrowed(),
+        options,
+      )
+      .map(Self::Buffer)
+    })
     .or_else(|_| {
       GPUBufferBinding::convert(scope, value, prefix, context, options)
         .map(Self::BufferBinding)

deno_webgpu/buffer.rs

@@ -114,6 +114,9 @@ impl GPUBuffer {
     *self.map_state.borrow()
   }
 
+  // In the successful case, the promise should resolve to undefined, but
+  // `#[undefined]` does not seem to work here.
+  // https://github.com/denoland/deno/issues/29603
   #[async_method]
   async fn map_async(
     &self,
@@ -250,6 +253,7 @@ impl GPUBuffer {
   }
 
   #[nofast]
+  #[undefined]
   fn unmap(&self, scope: &mut v8::HandleScope) -> Result<(), BufferError> {
     for ab in self.mapped_js_buffers.replace(vec![]) {
       let ab = ab.open(scope);
@@ -267,6 +271,7 @@ impl GPUBuffer {
   }
 
   #[fast]
+  #[undefined]
   fn destroy(&self) {
     self.instance.buffer_destroy(self.id);
   }

deno_webgpu/command_encoder.rs

@@ -75,9 +75,11 @@ impl GPUCommandEncoder {
         .map(|attachment| {
           attachment.into_option().map(|attachment| {
             wgpu_core::command::RenderPassColorAttachment {
-              view: attachment.view.id,
+              view: attachment.view.to_view_id(),
               depth_slice: attachment.depth_slice,
-              resolve_target: attachment.resolve_target.map(|target| target.id),
+              resolve_target: attachment
+                .resolve_target
+                .map(|target| target.to_view_id()),
               load_op: attachment
                 .load_op
                 .with_default_value(attachment.clear_value.map(Into::into)),
@@ -103,7 +105,7 @@ impl GPUCommandEncoder {
                 }
 
                 Ok(wgpu_core::command::RenderPassDepthStencilAttachment {
-                    view: attachment.view.id,
+                    view: attachment.view.to_view_id(),
                     depth: PassChannel {
                         load_op: attachment
                             .depth_load_op
@@ -191,6 +193,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(2)]
+  #[undefined]
   fn copy_buffer_to_buffer<'a>(
     &self,
     scope: &mut v8::HandleScope<'a>,
@@ -280,6 +283,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(3)]
+  #[undefined]
   fn copy_buffer_to_texture(
     &self,
     #[webidl] source: GPUTexelCopyBufferInfo,
@@ -315,6 +319,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(3)]
+  #[undefined]
   fn copy_texture_to_buffer(
     &self,
     #[webidl] source: GPUTexelCopyTextureInfo,
@@ -350,6 +355,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(3)]
+  #[undefined]
   fn copy_texture_to_texture(
     &self,
     #[webidl] source: GPUTexelCopyTextureInfo,
@@ -383,6 +389,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(1)]
+  #[undefined]
   fn clear_buffer(
     &self,
     #[webidl] buffer: Ptr<GPUBuffer>,
@@ -397,6 +404,7 @@ impl GPUCommandEncoder {
   }
 
   #[required(5)]
+  #[undefined]
   fn resolve_query_set(
     &self,
     #[webidl] query_set: Ptr<super::query_set::GPUQuerySet>,

deno_webgpu/compute_pass.rs

@@ -49,6 +49,7 @@ impl GPUComputePassEncoder {
     // TODO(@crowlKats): no-op, needs wpgu to implement changing the label
   }
 
+  #[undefined]
   fn set_pipeline(
     &self,
     #[webidl] pipeline: Ptr<crate::compute_pipeline::GPUComputePipeline>,
@@ -63,6 +64,7 @@ impl GPUComputePassEncoder {
     self.error_handler.push_error(err);
   }
 
+  #[undefined]
   fn dispatch_workgroups(
     &self,
     #[webidl(options(enforce_range = true))] work_group_count_x: u32,
@@ -83,6 +85,7 @@ impl GPUComputePassEncoder {
     self.error_handler.push_error(err);
   }
 
+  #[undefined]
   fn dispatch_workgroups_indirect(
     &self,
     #[webidl] indirect_buffer: Ptr<crate::buffer::GPUBuffer>,
@@ -100,6 +103,7 @@ impl GPUComputePassEncoder {
   }
 
   #[fast]
+  #[undefined]
   fn end(&self) {
     let err = self
       .instance
@@ -108,6 +112,7 @@ impl GPUComputePassEncoder {
     self.error_handler.push_error(err);
   }
 
+  #[undefined]
   fn push_debug_group(&self, #[webidl] group_label: String) {
     let err = self
       .instance
@@ -121,6 +126,7 @@ impl GPUComputePassEncoder {
   }
 
   #[fast]
+  #[undefined]
   fn pop_debug_group(&self) {
     let err = self
       .instance
@@ -129,6 +135,7 @@ impl GPUComputePassEncoder {
     self.error_handler.push_error(err);
   }
 
+  #[undefined]
   fn insert_debug_marker(&self, #[webidl] marker_label: String) {
     let err = self
       .instance
@@ -141,6 +148,7 @@ impl GPUComputePassEncoder {
     self.error_handler.push_error(err);
   }
 
+  #[undefined]
   fn set_bind_group<'a>(
     &self,
     scope: &mut v8::HandleScope<'a>,

deno_webgpu/device.rs

@@ -142,6 +142,7 @@ impl GPUDevice {
   }
 
   #[fast]
+  #[undefined]
   fn destroy(&self) {
     self.instance.device_destroy(self.id);
     self
@@ -230,6 +231,7 @@ impl GPUDevice {
       instance: self.instance.clone(),
       error_handler: self.error_handler.clone(),
       id,
+      default_view_id: Default::default(),
       label: descriptor.label,
       size: wgpu_descriptor.size,
       mip_level_count: wgpu_descriptor.mip_level_count,
@@ -403,9 +405,19 @@ impl GPUDevice {
           GPUBindingResource::Sampler(sampler) => {
             BindingResource::Sampler(sampler.id)
           }
+          GPUBindingResource::Texture(texture) => {
+            BindingResource::TextureView(texture.default_view_id())
+          }
           GPUBindingResource::TextureView(texture_view) => {
             BindingResource::TextureView(texture_view.id)
           }
+          GPUBindingResource::Buffer(buffer) => {
+            BindingResource::Buffer(wgpu_core::binding_model::BufferBinding {
+              buffer: buffer.id,
+              offset: 0,
+              size: NonZeroU64::new(buffer.size),
+            })
+          }
           GPUBindingResource::BufferBinding(buffer_binding) => {
             BindingResource::Buffer(wgpu_core::binding_model::BufferBinding {
               buffer: buffer_binding.buffer.id,
@@ -623,6 +635,7 @@ impl GPUDevice {
   }
 
   #[required(1)]
+  #[undefined]
   fn push_error_scope(&self, #[webidl] filter: super::error::GPUErrorFilter) {
     self
       .error_handler

deno_webgpu/query_set.rs

@@ -53,6 +53,7 @@ impl GPUQuerySet {
   }
 
   #[fast]
+  #[undefined]
   fn destroy(&self) -> Result<(), JsErrorBox> {
     // TODO(https://github.com/gfx-rs/wgpu/issues/6495): Destroy the query
     // set. Until that is supported, it is okay to do nothing here, the