diff --git a/player/src/lib.rs b/player/src/lib.rs index 85fd8e9bf..91adf5e91 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -88,7 +88,7 @@ impl GlobalPlay for wgc::hub::Global { dst, subresource_range, } => self - .command_encoder_clear_image::(encoder, dst, subresource_range) + .command_encoder_clear_image::(encoder, dst, &subresource_range) .unwrap(), trace::Command::WriteTimestamp { query_set_id, diff --git a/wgpu-core/src/command/clear.rs b/wgpu-core/src/command/clear.rs index 847fe43bc..1698613dd 100644 --- a/wgpu-core/src/command/clear.rs +++ b/wgpu-core/src/command/clear.rs @@ -169,7 +169,7 @@ impl Global { &self, command_encoder_id: CommandEncoderId, dst: TextureId, - subresource_range: ImageSubresourceRange, + subresource_range: &ImageSubresourceRange, ) -> Result<(), ClearError> { profiling::scope!("CommandEncoder::clear_image"); diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index 878bcbb87..96bef1909 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -1783,6 +1783,39 @@ impl crate::Context for Context { id } + fn command_encoder_clear_image( + &self, + encoder: &Self::CommandEncoderId, + texture: &crate::Texture, + subresource_range: &wgt::ImageSubresourceRange, + ) { + let global = &self.0; + if let Err(cause) = wgc::gfx_select!(encoder.id => global.command_encoder_clear_image( + encoder.id, + texture.id.id, + subresource_range + )) { + self.handle_error_nolabel(&encoder.error_sink, cause, "CommandEncoder::clear_image"); + } + } + + fn command_encoder_clear_buffer( + &self, + encoder: &Self::CommandEncoderId, + buffer: &crate::Buffer, + offset: wgt::BufferAddress, + size: Option, + ) { + let global = &self.0; + if let Err(cause) = wgc::gfx_select!(encoder.id => global.command_encoder_clear_buffer( + encoder.id, + buffer.id.id, + offset, size + )) { + self.handle_error_nolabel(&encoder.error_sink, cause, "CommandEncoder::clear_buffer"); + } + } + fn command_encoder_insert_debug_marker(&self, encoder: &Self::CommandEncoderId, label: &str) { let global = &self.0; if let Err(cause) = wgc::gfx_select!(encoder.id => global.command_encoder_insert_debug_marker(encoder.id, &label)) diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index ad5513e28..912c0d328 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -1899,6 +1899,23 @@ impl crate::Context for Context { }) } + fn command_encoder_clear_image( + &self, + _encoder: &Self::CommandEncoderId, + _texture: &crate::Texture, + _subresource_range: &wgt::ImageSubresourceRange, + ) { + } + + fn command_encoder_clear_buffer( + &self, + _encoder: &Self::CommandEncoderId, + _buffer: &crate::Buffer, + _offset: wgt::BufferAddress, + _size: Option, + ) { + } + fn command_encoder_insert_debug_marker(&self, _encoder: &Self::CommandEncoderId, _label: &str) { // Not available in gecko yet // encoder.insert_debug_marker(label); @@ -1920,7 +1937,7 @@ impl crate::Context for Context { _query_set: &Self::QuerySetId, _query_index: u32, ) { - // Not available in gecko yet + unimplemented!(); } fn command_encoder_resolve_query_set( @@ -1932,7 +1949,7 @@ impl crate::Context for Context { _destination: &Self::BufferId, _destination_offset: wgt::BufferAddress, ) { - // Not available in gecko yet + unimplemented!(); } fn render_bundle_encoder_finish( diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index fa4bb4751..e3068a95d 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -401,6 +401,20 @@ trait Context: Debug + Send + Sized + Sync { ); fn command_encoder_finish(&self, encoder: Self::CommandEncoderId) -> Self::CommandBufferId; + fn command_encoder_clear_image( + &self, + encoder: &Self::CommandEncoderId, + texture: &Texture, + subresource_range: &wgt::ImageSubresourceRange, + ); + fn command_encoder_clear_buffer( + &self, + encoder: &Self::CommandEncoderId, + buffer: &Buffer, + offset: BufferAddress, + size: Option, + ); + fn command_encoder_insert_debug_marker(&self, encoder: &Self::CommandEncoderId, label: &str); fn command_encoder_push_debug_group(&self, encoder: &Self::CommandEncoderId, label: &str); fn command_encoder_pop_debug_group(&self, encoder: &Self::CommandEncoderId); @@ -2111,6 +2125,48 @@ impl CommandEncoder { ); } + /// Clears texture to zero. + /// + /// # Panics + /// + /// - `CLEAR_COMMANDS` extension not enabled + /// - Texture does not have `COPY_DST` usage. + /// - Range it out of bounds + pub fn clear_texture( + &mut self, + texture: &Texture, + subresource_range: &wgt::ImageSubresourceRange, + ) { + Context::command_encoder_clear_image( + &*self.context, + self.id.as_ref().unwrap(), + texture, + subresource_range, + ); + } + + /// Clears buffer to zero. + /// + /// # Panics + /// + /// - `CLEAR_COMMANDS` extension not enabled + /// - Buffer does not have `COPY_DST` usage. + /// - Range it out of bounds + pub fn clear_buffer( + &mut self, + buffer: &Buffer, + offset: BufferAddress, + size: Option, + ) { + Context::command_encoder_clear_buffer( + &*self.context, + self.id.as_ref().unwrap(), + buffer, + offset, + size, + ); + } + /// Inserts debug marker. pub fn insert_debug_marker(&mut self, label: &str) { let id = self.id.as_ref().unwrap();