Reformat and stuff

Author: inner-daemons

src/conv.rs

@@ -1052,7 +1052,9 @@ pub fn map_display_hdr_info(info: wgt::DisplayHdrInfo) -> native::WGPUDisplayHdr
     let coarse = match info.coarse {
         Some(c) => {
             let (has_gamut, gamut) = match c.gamut {
-                Some(wgt::DisplayGamut::Srgb) => (true as native::WGPUBool, native::WGPUDisplayGamut_Srgb),
+                Some(wgt::DisplayGamut::Srgb) => {
+                    (true as native::WGPUBool, native::WGPUDisplayGamut_Srgb)
+                }
                 Some(wgt::DisplayGamut::DisplayP3) => {
                     (true as native::WGPUBool, native::WGPUDisplayGamut_DisplayP3)
                 }
@@ -1104,9 +1106,11 @@ pub fn map_load_op<T>(
         //
         // SAFETY: `DontCare` was explicitly requested by the C caller, opting in
         // to its documented undefined-contents semantics at their own risk.
-        other if other == native::WGPULoadOp_DontCare as native::WGPULoadOp => Some(
-            wgc::command::LoadOp::DontCare(unsafe { wgt::LoadOpDontCare::enabled() }),
-        ),
+        other if other == native::WGPULoadOp_DontCare as native::WGPULoadOp => {
+            Some(wgc::command::LoadOp::DontCare(unsafe {
+                wgt::LoadOpDontCare::enabled()
+            }))
+        }
         _ => None,
     }
 }
@@ -2306,7 +2310,9 @@ pub fn map_surface_color_space(cs: native::WGPUSurfaceColorSpace) -> wgt::Surfac
         native::WGPUSurfaceColorSpace_Bt2100Pq => wgt::SurfaceColorSpace::Bt2100Pq,
         native::WGPUSurfaceColorSpace_Bt2100Hlg => wgt::SurfaceColorSpace::Bt2100Hlg,
         native::WGPUSurfaceColorSpace_ExtendedSrgb => wgt::SurfaceColorSpace::ExtendedSrgb,
-        native::WGPUSurfaceColorSpace_ExtendedDisplayP3 => wgt::SurfaceColorSpace::ExtendedDisplayP3,
+        native::WGPUSurfaceColorSpace_ExtendedDisplayP3 => {
+            wgt::SurfaceColorSpace::ExtendedDisplayP3
+        }
         // WGPUSurfaceColorSpace_Auto and any unknown value.
         _ => wgt::SurfaceColorSpace::Auto,
     }

src/lib.rs

@@ -27,7 +27,7 @@ use utils::{
     string_view_into_label, string_view_into_str, texture_format_has_depth,
 };
 use wgc::{
-    command::{bundle_ffi, ComputePass, RenderPass},
+    command::{ComputePass, RenderPass},
     id, resource, Label,
 };
 
@@ -3869,10 +3869,11 @@ pub unsafe extern "C" fn wgpuRenderBundleEncoderDrawIndirect(
     let encoder = encoder.expect("invalid render bundle");
     let encoder = encoder.as_mut().unwrap();
 
-    let _ =
-        bundle
-            .context
-            .render_bundle_encoder_draw_indirect(encoder, indirect_buffer_id, indirect_offset);
+    let _ = bundle.context.render_bundle_encoder_draw_indirect(
+        encoder,
+        indirect_buffer_id,
+        indirect_offset,
+    );
 }
 
 #[no_mangle]
@@ -3895,8 +3896,7 @@ pub unsafe extern "C-unwind" fn wgpuRenderBundleEncoderFinish(
 
     // v30 takes the encoder by `&mut` instead of consuming it; the `Box` is
     // still dropped at end of scope, freeing the reclaimed raw pointer.
-    let (render_bundle_id, error) =
-        context.render_bundle_encoder_finish(&mut encoder, &desc, None);
+    let (render_bundle_id, error) = context.render_bundle_encoder_finish(&mut encoder, &desc, None);
     if let Some(cause) = error {
         handle_error_fatal(cause, "wgpuRenderBundleEncoderFinish");
     }
@@ -5416,7 +5416,13 @@ pub unsafe extern "C" fn wgpuRenderBundleEncoderSetImmediates(
     let encoder = encoder.expect("invalid render bundle");
     let encoder = encoder.as_mut().unwrap();
 
-    bundle_ffi::wgpu_render_bundle_set_immediates(encoder, offset, size, data);
+    if let Err(cause) = bundle.context.render_bundle_encoder_set_immediates(
+        encoder,
+        offset,
+        make_slice(data, size as usize),
+    ) {
+        handle_error_fatal(cause, "wgpuRenderBundleEncoderSetImmediates");
+    }
 }
 
 #[no_mangle]