add RenderPassColorAttachment::depth_slice

teoxoy · teoxoy · commit 5ecc48d49421 · 2025-04-25T12:39:45.000+02:00
diff --git a/benches/benches/wgpu-benchmark/renderpass.rs b/benches/benches/wgpu-benchmark/renderpass.rs
@@ -360,6 +360,7 @@ impl RenderpassState {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &self.render_target,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
@@ -406,6 +407,7 @@ impl RenderpassState {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &self.render_target,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/deno_webgpu/command_encoder.rs b/deno_webgpu/command_encoder.rs
@@ -63,6 +63,7 @@ impl GPUCommandEncoder {
                     attachment.into_option().map(|attachment| {
                         wgpu_core::command::RenderPassColorAttachment {
                             view: attachment.view.id,
+                            depth_slice: attachment.depth_slice,
                             resolve_target: attachment.resolve_target.map(|target| target.id),
                             load_op: attachment
                                 .load_op
diff --git a/deno_webgpu/render_pass.rs b/deno_webgpu/render_pass.rs
@@ -402,8 +402,8 @@ pub(crate) struct GPURenderPassDescriptor {
 #[webidl(dictionary)]
 pub(crate) struct GPURenderPassColorAttachment {
     pub view: Ptr<GPUTextureView>,
-    /*#[options(enforce_range = true)]
-    pub depth_slice: Option<u32>,*/
+    #[options(enforce_range = true)]
+    pub depth_slice: Option<u32>,
     pub resolve_target: Option<Ptr<GPUTextureView>>,
     pub clear_value: Option<GPUColor>,
     pub load_op: GPULoadOp,
diff --git a/examples/features/src/boids/mod.rs b/examples/features/src/boids/mod.rs
@@ -263,6 +263,7 @@ impl crate::framework::Example for Example {
         // create render pass descriptor and its color attachments
         let color_attachments = [Some(wgpu::RenderPassColorAttachment {
             view,
+            depth_slice: None,
             resolve_target: None,
             ops: wgpu::Operations {
                 load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/examples/features/src/bunnymark/mod.rs b/examples/features/src/bunnymark/mod.rs
@@ -112,6 +112,7 @@ impl Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(clear_color),
diff --git a/examples/features/src/conservative_raster/mod.rs b/examples/features/src/conservative_raster/mod.rs
@@ -263,6 +263,7 @@ impl crate::framework::Example for Example {
                 label: Some("low resolution"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &self.low_res_target,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
@@ -284,6 +285,7 @@ impl crate::framework::Example for Example {
                 label: Some("full resolution"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/examples/features/src/cube/mod.rs b/examples/features/src/cube/mod.rs
@@ -341,6 +341,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/hello_triangle/mod.rs b/examples/features/src/hello_triangle/mod.rs
@@ -118,6 +118,7 @@ async fn run(event_loop: EventLoop<()>, window: Window) {
                                     label: None,
                                     color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                                         view: &view,
+                                        depth_slice: None,
                                         resolve_target: None,
                                         ops: wgpu::Operations {
                                             load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/hello_windows/mod.rs b/examples/features/src/hello_windows/mod.rs
@@ -119,6 +119,7 @@ async fn run(event_loop: EventLoop<()>, viewports: Vec<(Arc<Window>, wgpu::Color
                                         color_attachments: &[Some(
                                             wgpu::RenderPassColorAttachment {
                                                 view: &view,
+                                                depth_slice: None,
                                                 resolve_target: None,
                                                 ops: wgpu::Operations {
                                                     load: wgpu::LoadOp::Clear(
diff --git a/examples/features/src/mipmap/mod.rs b/examples/features/src/mipmap/mod.rs
@@ -160,6 +160,7 @@ impl Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &views[target_mip],
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::WHITE),
@@ -481,6 +482,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(clear_color),
diff --git a/examples/features/src/msaa_line/mod.rs b/examples/features/src/msaa_line/mod.rs
@@ -279,6 +279,7 @@ impl crate::framework::Example for Example {
             let rpass_color_attachment = if self.sample_count == 1 {
                 wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
@@ -288,6 +289,7 @@ impl crate::framework::Example for Example {
             } else {
                 wgpu::RenderPassColorAttachment {
                     view: &self.multisampled_framebuffer,
+                    depth_slice: None,
                     resolve_target: Some(view),
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/examples/features/src/multiple_render_targets/mod.rs b/examples/features/src/multiple_render_targets/mod.rs
@@ -329,6 +329,7 @@ impl TargetRenderer {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: surface_view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
@@ -508,11 +509,13 @@ impl crate::framework::Example for Example {
             &[
                 Some(wgpu::RenderPassColorAttachment {
                     view: &self.texture_targets.red_view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: Default::default(),
                 }),
                 Some(wgpu::RenderPassColorAttachment {
                     view: &self.texture_targets.green_view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: Default::default(),
                 }),
diff --git a/examples/features/src/ray_cube_compute/mod.rs b/examples/features/src/ray_cube_compute/mod.rs
@@ -462,6 +462,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/ray_cube_fragment/mod.rs b/examples/features/src/ray_cube_fragment/mod.rs
@@ -349,6 +349,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/ray_cube_normals/mod.rs b/examples/features/src/ray_cube_normals/mod.rs
@@ -450,6 +450,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/ray_scene/mod.rs b/examples/features/src/ray_scene/mod.rs
@@ -529,6 +529,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/ray_shadows/mod.rs b/examples/features/src/ray_shadows/mod.rs
@@ -335,6 +335,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/ray_traced_triangle/mod.rs b/examples/features/src/ray_traced_triangle/mod.rs
@@ -406,6 +406,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/render_to_texture/mod.rs b/examples/features/src/render_to_texture/mod.rs
@@ -84,6 +84,7 @@ async fn run(_path: Option<String>) {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &texture_view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/shadow/mod.rs b/examples/features/src/shadow/mod.rs
@@ -794,6 +794,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/skybox/mod.rs b/examples/features/src/skybox/mod.rs
@@ -426,6 +426,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/srgb_blend/mod.rs b/examples/features/src/srgb_blend/mod.rs
@@ -181,6 +181,7 @@ impl<const SRGB: bool> crate::framework::Example for Example<SRGB> {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/stencil_triangles/mod.rs b/examples/features/src/stencil_triangles/mod.rs
@@ -200,6 +200,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color {
diff --git a/examples/features/src/texture_arrays/mod.rs b/examples/features/src/texture_arrays/mod.rs
@@ -392,6 +392,7 @@ impl crate::framework::Example for Example {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/examples/features/src/timestamp_queries/mod.rs b/examples/features/src/timestamp_queries/mod.rs
@@ -380,6 +380,7 @@ fn render_pass(
         label: None,
         color_attachments: &[Some(wgpu::RenderPassColorAttachment {
             view: &render_target_view,
+            depth_slice: None,
             resolve_target: None,
             ops: wgpu::Operations {
                 load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/uniform_values/mod.rs b/examples/features/src/uniform_values/mod.rs
@@ -307,6 +307,7 @@ async fn run(event_loop: EventLoop<()>, window: Arc<Window>) {
                                         color_attachments: &[Some(
                                             wgpu::RenderPassColorAttachment {
                                                 view: &view,
+                                                depth_slice: None,
                                                 resolve_target: None,
                                                 ops: wgpu::Operations {
                                                     load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/examples/features/src/water/mod.rs b/examples/features/src/water/mod.rs
@@ -731,6 +731,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &self.reflect_view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(back_color),
@@ -760,6 +761,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(back_color),
@@ -789,6 +791,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Load,
diff --git a/examples/standalone/02_hello_window/src/main.rs b/examples/standalone/02_hello_window/src/main.rs
@@ -97,6 +97,7 @@ impl State {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &texture_view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
diff --git a/tests/tests/wgpu-gpu/binding_array/sampled_textures.rs b/tests/tests/wgpu-gpu/binding_array/sampled_textures.rs
@@ -210,6 +210,7 @@ async fn binding_array_sampled_textures(ctx: TestingContext, partially_bound: bo
             label: Some("Render Pass"),
             color_attachments: &[Some(RenderPassColorAttachment {
                 view: &output_view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: Operations {
                     load: LoadOp::Clear(Color::BLACK),
diff --git a/tests/tests/wgpu-gpu/device.rs b/tests/tests/wgpu-gpu/device.rs
@@ -369,6 +369,7 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
                         ops: wgpu::Operations::default(),
                         resolve_target: None,
                         view: &target_view,
+                        depth_slice: None,
                     })],
                     depth_stencil_attachment: None,
                     timestamp_writes: None,
diff --git a/tests/tests/wgpu-gpu/draw_indirect.rs b/tests/tests/wgpu-gpu/draw_indirect.rs
@@ -241,6 +241,7 @@ async fn run_test(ctx: TestingContext, test_data: TestData, expect_noop: bool) {
                 ops: wgpu::Operations::default(),
                 resolve_target: None,
                 view: &out_texture_view,
+                depth_slice: None,
             })],
             depth_stencil_attachment: None,
             timestamp_writes: None,
@@ -707,6 +708,7 @@ async fn indirect_buffer_offsets(ctx: TestingContext) {
                 ops: wgpu::Operations::default(),
                 resolve_target: None,
                 view: &out_texture_view,
+                depth_slice: None,
             })],
             depth_stencil_attachment: None,
             timestamp_writes: None,
diff --git a/tests/tests/wgpu-gpu/encoder.rs b/tests/tests/wgpu-gpu/encoder.rs
@@ -55,6 +55,7 @@ static DROP_ENCODER_AFTER_ERROR: GpuTestConfiguration = GpuTestConfiguration::ne
                 ops: wgpu::Operations::default(),
                 resolve_target: None,
                 view: &target_view,
+                depth_slice: None,
             })],
             depth_stencil_attachment: None,
             timestamp_writes: None,
@@ -285,6 +286,7 @@ fn encoder_operations_fail_while_pass_alive(ctx: TestingContext) {
                     .begin_render_pass(&wgpu::RenderPassDescriptor {
                         color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                             view: &color_attachment_view,
+                            depth_slice: None,
                             resolve_target: None,
                             ops: wgpu::Operations::default(),
                         })],
diff --git a/tests/tests/wgpu-gpu/mem_leaks.rs b/tests/tests/wgpu-gpu/mem_leaks.rs
@@ -187,6 +187,7 @@ async fn draw_test_with_reports(
             ops: wgpu::Operations::default(),
             resolve_target: None,
             view: &texture_view,
+            depth_slice: None,
         })],
         depth_stencil_attachment: None,
         timestamp_writes: None,
diff --git a/tests/tests/wgpu-gpu/nv12_texture/mod.rs b/tests/tests/wgpu-gpu/nv12_texture/mod.rs
@@ -109,6 +109,7 @@ static NV12_TEXTURE_CREATION_SAMPLING: GpuTestConfiguration = GpuTestConfigurati
                 ops: wgpu::Operations::default(),
                 resolve_target: None,
                 view: &target_view,
+                depth_slice: None,
             })],
             depth_stencil_attachment: None,
             timestamp_writes: None,
diff --git a/tests/tests/wgpu-gpu/push_constants.rs b/tests/tests/wgpu-gpu/push_constants.rs
@@ -301,6 +301,7 @@ async fn render_pass_test(ctx: &TestingContext, use_render_bundle: bool) {
         label: Some("Render Pass"),
         color_attachments: &[Some(RenderPassColorAttachment {
             view: &output_texture_view,
+            depth_slice: None,
             resolve_target: None,
             ops: Operations {
                 load: LoadOp::Clear(Color::default()),
diff --git a/tests/tests/wgpu-gpu/regression/issue_3349.rs b/tests/tests/wgpu-gpu/regression/issue_3349.rs
@@ -151,6 +151,7 @@ async fn multi_stage_data_binding_test(ctx: TestingContext) {
             label: Some("rpass"),
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
diff --git a/tests/tests/wgpu-gpu/regression/issue_3457.rs b/tests/tests/wgpu-gpu/regression/issue_3457.rs
@@ -141,6 +141,7 @@ static PASS_RESET_VERTEX_BUFFER: GpuTestConfiguration =
             label: Some("double renderpass"),
             color_attachments: &[Some(RenderPassColorAttachment {
                 view: &view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: Operations {
                     load: LoadOp::Clear(Color::BLACK),
@@ -176,6 +177,7 @@ static PASS_RESET_VERTEX_BUFFER: GpuTestConfiguration =
             label: Some("single renderpass"),
             color_attachments: &[Some(RenderPassColorAttachment {
                 view: &view,
+                depth_slice: None,
                 resolve_target: None,
                 ops: Operations {
                     load: LoadOp::Clear(Color::BLACK),
diff --git a/tests/tests/wgpu-gpu/regression/issue_4485.rs b/tests/tests/wgpu-gpu/regression/issue_4485.rs
@@ -76,6 +76,7 @@ async fn test_impl(ctx: &TestingContext) {
                 label: Some("Renderpass"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &texture_view,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         // Important: this isn't the color expected below
diff --git a/tests/tests/wgpu-gpu/regression/issue_4514.rs b/tests/tests/wgpu-gpu/regression/issue_4514.rs
diff --git a/tests/tests/wgpu-gpu/render_pass_ownership.rs b/tests/tests/wgpu-gpu/render_pass_ownership.rs
diff --git a/tests/tests/wgpu-gpu/render_target.rs b/tests/tests/wgpu-gpu/render_target.rs
diff --git a/tests/tests/wgpu-gpu/scissor_tests/mod.rs b/tests/tests/wgpu-gpu/scissor_tests/mod.rs
diff --git a/tests/tests/wgpu-gpu/shader_primitive_index/mod.rs b/tests/tests/wgpu-gpu/shader_primitive_index/mod.rs
diff --git a/tests/tests/wgpu-gpu/shader_view_format/mod.rs b/tests/tests/wgpu-gpu/shader_view_format/mod.rs
diff --git a/tests/tests/wgpu-gpu/vertex_formats/mod.rs b/tests/tests/wgpu-gpu/vertex_formats/mod.rs
diff --git a/tests/tests/wgpu-gpu/vertex_indices/mod.rs b/tests/tests/wgpu-gpu/vertex_indices/mod.rs
diff --git a/tests/tests/wgpu-gpu/zero_init_texture_after_discard.rs b/tests/tests/wgpu-gpu/zero_init_texture_after_discard.rs
diff --git a/wgpu-core/src/command/clear.rs b/wgpu-core/src/command/clear.rs
diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs
diff --git a/wgpu-hal/examples/halmark/main.rs b/wgpu-hal/examples/halmark/main.rs
diff --git a/wgpu-hal/examples/raw-gles.rs b/wgpu-hal/examples/raw-gles.rs
diff --git a/wgpu-hal/src/dynamic/command.rs b/wgpu-hal/src/dynamic/command.rs
diff --git a/wgpu-hal/src/lib.rs b/wgpu-hal/src/lib.rs
diff --git a/wgpu/src/api/render_pass.rs b/wgpu/src/api/render_pass.rs
diff --git a/wgpu/src/backend/wgpu_core.rs b/wgpu/src/backend/wgpu_core.rs
diff --git a/wgpu/src/util/texture_blitter.rs b/wgpu/src/util/texture_blitter.rs
