diff --git a/wgpu-core/src/command/clear.rs b/wgpu-core/src/command/clear.rs index 69f9596bd..ceceb2ba5 100644 --- a/wgpu-core/src/command/clear.rs +++ b/wgpu-core/src/command/clear.rs @@ -453,6 +453,7 @@ fn clear_texture_via_render_passes( depth_stencil_attachment, multiview: None, timestamp_writes: None, + occlusion_query_set: None, }); encoder.end_render_pass(); } diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index 45c60bb20..4066bb3a0 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -758,6 +758,7 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> { color_attachments: &[Option], depth_stencil_attachment: Option<&RenderPassDepthStencilAttachment>, timestamp_writes: Option<&RenderPassTimestampWrites>, + occlusion_query_set: Option, cmd_buf: &mut CommandBuffer, view_guard: &'a Storage, id::TextureViewId>, buffer_guard: &'a Storage, id::BufferId>, @@ -1151,6 +1152,18 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> { None }; + let occlusion_query_set = if let Some(occlusion_query_set) = occlusion_query_set { + let query_set = cmd_buf + .trackers + .query_sets + .add_single(query_set_guard, occlusion_query_set) + .ok_or(RenderPassErrorInner::InvalidQuerySet(occlusion_query_set))?; + + Some(&query_set.raw) + } else { + None + }; + let hal_desc = hal::RenderPassDescriptor { label, extent, @@ -1159,6 +1172,7 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> { depth_stencil_attachment: depth_stencil, multiview, timestamp_writes, + occlusion_query_set, }; unsafe { cmd_buf.encoder.raw.begin_render_pass(&hal_desc); @@ -1247,6 +1261,7 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> { }), multiview: self.multiview, timestamp_writes: None, + occlusion_query_set: None, }; unsafe { raw.begin_render_pass(&desc); @@ -1343,6 +1358,7 @@ impl Global { color_attachments, depth_stencil_attachment, timestamp_writes, + occlusion_query_set_id, cmd_buf, &*view_guard, &*buffer_guard, diff --git a/wgpu-hal/examples/halmark/main.rs b/wgpu-hal/examples/halmark/main.rs index 7577e00df..21289b18e 100644 --- a/wgpu-hal/examples/halmark/main.rs +++ b/wgpu-hal/examples/halmark/main.rs @@ -680,6 +680,7 @@ impl Example { depth_stencil_attachment: None, multiview: None, timestamp_writes: None, + occlusion_query_set: None, }; unsafe { ctx.encoder.begin_render_pass(&pass_desc); diff --git a/wgpu-hal/examples/raw-gles.rs b/wgpu-hal/examples/raw-gles.rs index 30445520b..0e89783aa 100644 --- a/wgpu-hal/examples/raw-gles.rs +++ b/wgpu-hal/examples/raw-gles.rs @@ -176,6 +176,7 @@ fn fill_screen(exposed: &hal::ExposedAdapter, width: u32, height depth_stencil_attachment: None, multiview: None, timestamp_writes: None, + occlusion_query_set: None, }; unsafe { encoder.begin_encoding(None).unwrap(); diff --git a/wgpu-hal/src/lib.rs b/wgpu-hal/src/lib.rs index 4c085b31b..1248ee903 100644 --- a/wgpu-hal/src/lib.rs +++ b/wgpu-hal/src/lib.rs @@ -465,7 +465,13 @@ pub trait CommandEncoder: WasmNotSend + WasmNotSync + fmt::Debug { // queries + /// # Safety: + /// + /// - If `set` is an occlusion query set, it must be the same one as used in the [`RenderPassDescriptor::occlusion_query_set`] parameter. unsafe fn begin_query(&mut self, set: &A::QuerySet, index: u32); + /// # Safety: + /// + /// - If `set` is an occlusion query set, it must be the same one as used in the [`RenderPassDescriptor::occlusion_query_set`] parameter. unsafe fn end_query(&mut self, set: &A::QuerySet, index: u32); unsafe fn write_timestamp(&mut self, set: &A::QuerySet, index: u32); unsafe fn reset_queries(&mut self, set: &A::QuerySet, range: Range); @@ -1293,6 +1299,7 @@ pub struct RenderPassDescriptor<'a, A: Api> { pub depth_stencil_attachment: Option>, pub multiview: Option, pub timestamp_writes: Option>, + pub occlusion_query_set: Option<&'a A::QuerySet>, } #[derive(Debug)] diff --git a/wgpu-hal/src/metal/command.rs b/wgpu-hal/src/metal/command.rs index d457008dc..05af2805b 100644 --- a/wgpu-hal/src/metal/command.rs +++ b/wgpu-hal/src/metal/command.rs @@ -385,7 +385,6 @@ impl crate::CommandEncoder for super::CommandEncoder { objc::rc::autoreleasepool(|| { let descriptor = metal::RenderPassDescriptor::new(); - //TODO: set visibility results buffer for (i, at) in desc.color_attachments.iter().enumerate() { if let Some(at) = at.as_ref() { @@ -454,11 +453,8 @@ impl crate::CommandEncoder for super::CommandEncoder { } } - if let Some(timestamp_writes) = desc.timestamp_writes.as_ref() { - let sba_descriptor = descriptor - .sample_buffer_attachments() - .object_at(0 as _) - .unwrap(); + if let Some(ref timestamp_writes) = desc.timestamp_writes { + let sba_descriptor = descriptor.sample_buffer_attachments().object_at(0).unwrap(); sba_descriptor.set_sample_buffer( timestamp_writes .query_set @@ -475,6 +471,11 @@ impl crate::CommandEncoder for super::CommandEncoder { } } + if let Some(occlusion_query_set) = desc.occlusion_query_set { + descriptor + .set_visibility_result_buffer(Some(occlusion_query_set.raw_buffer.as_ref())) + } + let raw = self.raw_cmd_buf.as_ref().unwrap(); let encoder = raw.new_render_command_encoder(descriptor); if let Some(label) = desc.label {