fix push constants extension api (#348)

gfx-rs · Jan 10, 2024 · be9457e · be9457e
1 parent 4726b67
commit be9457e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/ffi/wgpu.h b/ffi/wgpu.h
@@ -131,8 +131,8 @@ typedef struct WGPUPushConstantRange {
 
 typedef struct WGPUPipelineLayoutExtras {
     WGPUChainedStruct chain;
-    uint32_t pushConstantRangeCount;
-    WGPUPushConstantRange* pushConstantRanges;
+    size_t pushConstantRangeCount;
+    WGPUPushConstantRange const * pushConstantRanges;
 } WGPUPipelineLayoutExtras;
 
 typedef uint64_t WGPUSubmissionIndex;
@@ -238,7 +238,7 @@ void wgpuSetLogLevel(WGPULogLevel level);
 
 uint32_t wgpuGetVersion(void);
 
-void wgpuRenderPassEncoderSetPushConstants(WGPURenderPassEncoder encoder, WGPUShaderStageFlags stages, uint32_t offset, uint32_t sizeBytes, void* const data);
+void wgpuRenderPassEncoderSetPushConstants(WGPURenderPassEncoder encoder, WGPUShaderStageFlags stages, uint32_t offset, uint32_t sizeBytes, void const * data);
 
 void wgpuRenderPassEncoderMultiDrawIndirect(WGPURenderPassEncoder encoder, WGPUBuffer buffer, uint64_t offset, uint32_t count);
 void wgpuRenderPassEncoderMultiDrawIndexedIndirect(WGPURenderPassEncoder encoder, WGPUBuffer buffer, uint64_t offset, uint32_t count);

diff --git a/src/conv.rs b/src/conv.rs
@@ -350,17 +350,14 @@ pub unsafe fn map_pipeline_layout_descriptor<'a>(
         .collect::<Vec<_>>();
 
     let push_constant_ranges = extras.map_or(Vec::new(), |extras| {
-        make_slice(
-            extras.pushConstantRanges,
-            extras.pushConstantRangeCount as usize,
-        )
-        .iter()
-        .map(|range| wgt::PushConstantRange {
-            stages: wgt::ShaderStages::from_bits(range.stages)
-                .expect("invalid shader stage for push constant range"),
-            range: range.start..range.end,
-        })
-        .collect()
+        make_slice(extras.pushConstantRanges, extras.pushConstantRangeCount)
+            .iter()
+            .map(|range| wgt::PushConstantRange {
+                stages: wgt::ShaderStages::from_bits(range.stages)
+                    .expect("invalid shader stage for push constant range"),
+                range: range.start..range.end,
+            })
+            .collect()
     });
 
     return wgc::binding_model::PipelineLayoutDescriptor {

diff --git a/src/lib.rs b/src/lib.rs
@@ -4100,7 +4100,7 @@ pub unsafe extern "C" fn wgpuRenderPassEncoderSetPushConstants(
     stages: native::WGPUShaderStageFlags,
     offset: u32,
     size_bytes: u32,
-    size: *const u8,
+    data: *const u8,
 ) {
     let pass = pass.as_ref().expect("invalid render pass");
     let mut encoder = pass.encoder.write();
@@ -4110,7 +4110,7 @@ pub unsafe extern "C" fn wgpuRenderPassEncoderSetPushConstants(
         wgt::ShaderStages::from_bits(stages).expect("invalid shader stage"),
         offset,
         size_bytes,
-        size,
+        data,
     );
 }