add a todo for occlusion_query_set

gfx-rs · Sep 30, 2023 · c7c7174 · c7c7174
1 parent 6020389
commit c7c7174
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,8 +1,7 @@
 use conv::{
     map_device_descriptor, map_instance_backend_flags, map_instance_descriptor,
-    map_pipeline_layout_descriptor, map_primitive_state, map_shader_module, map_surface,
-    map_query_set_index,
-    CreateSurfaceParams,
+    map_pipeline_layout_descriptor, map_primitive_state, map_query_set_index, map_shader_module,
+    map_surface, CreateSurfaceParams,
 };
 use parking_lot::{Mutex, RwLock};
 use smallvec::SmallVec;
@@ -997,19 +996,25 @@ pub unsafe extern "C" fn wgpuCommandEncoderBeginComputePass(
         )
     };
 
-    let timestamp_writes = descriptor.map(|descriptor| {
-        descriptor.timestampWrites.as_ref().map(|timestamp_write| {
-            wgc::command::ComputePassTimestampWrites {
-                query_set:
-                    timestamp_write.querySet
-                    .as_ref()
-                    .expect("invalid query set in timestamp writes")
-                    .id,
-                beginning_of_pass_write_index: map_query_set_index(timestamp_write.beginningOfPassWriteIndex),
-                end_of_pass_write_index: map_query_set_index(timestamp_write.endOfPassWriteIndex),
-            }
+    let timestamp_writes = descriptor
+        .map(|descriptor| {
+            descriptor.timestampWrites.as_ref().map(|timestamp_write| {
+                wgc::command::ComputePassTimestampWrites {
+                    query_set: timestamp_write
+                        .querySet
+                        .as_ref()
+                        .expect("invalid query set in timestamp writes")
+                        .id,
+                    beginning_of_pass_write_index: map_query_set_index(
+                        timestamp_write.beginningOfPassWriteIndex,
+                    ),
+                    end_of_pass_write_index: map_query_set_index(
+                        timestamp_write.endOfPassWriteIndex,
+                    ),
+                }
+            })
         })
-    }).flatten();
+        .flatten();
 
     let desc = match descriptor {
         Some(descriptor) => wgc::command::ComputePassDescriptor {
@@ -1065,12 +1070,14 @@ pub unsafe extern "C" fn wgpuCommandEncoderBeginRenderPass(
 
     let timestamp_writes = descriptor.timestampWrites.as_ref().map(|timestamp_write| {
         wgc::command::RenderPassTimestampWrites {
-            query_set:
-                timestamp_write.querySet
+            query_set: timestamp_write
+                .querySet
                 .as_ref()
                 .expect("invalid query set in timestamp writes")
                 .id,
-            beginning_of_pass_write_index: map_query_set_index(timestamp_write.beginningOfPassWriteIndex),
+            beginning_of_pass_write_index: map_query_set_index(
+                timestamp_write.beginningOfPassWriteIndex,
+            ),
             end_of_pass_write_index: map_query_set_index(timestamp_write.endOfPassWriteIndex),
         }
     });
@@ -1098,7 +1105,7 @@ pub unsafe extern "C" fn wgpuCommandEncoderBeginRenderPass(
         ),
         depth_stencil_attachment: depth_stencil_attachment.as_ref(),
         timestamp_writes: timestamp_writes.as_ref(),
-        occlusion_query_set: None,
+        occlusion_query_set: None, // TODO: populate via ext
     };
 
     Arc::into_raw(Arc::new(WGPURenderPassEncoderImpl {