style: cargo fmt

chyyran · chyyran · commit 2d2e1b57ec4d · 2026-07-05T01:57:53.000+09:00
diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml
@@ -25,7 +25,7 @@ librashader-pack = { path = "../librashader-pack", version = "0.11.4" }
 
 spirv-cross2 = { workspace = true, optional = true }
 
-naga = { version = "29", optional = true }
+naga = { version = "30", optional = true }
 rspirv = { version = "0.13.0" }
 spirv = { version = "0.4.0" }
 
diff --git a/librashader-reflect/src/reflect/naga/msl.rs b/librashader-reflect/src/reflect/naga/msl.rs
@@ -34,6 +34,10 @@ impl CompileShader<MSL> for NagaReflect {
             bounds_check_policies: Default::default(),
             zero_initialize_workgroup_memory: false,
             force_loop_bounding: false,
+            task_dispatch_limits: None,
+            mesh_shader_primitive_indices_clamp: false,
+            emit_int_div_checks: true,
+            ray_query_initialization_tracking: false,
         };
 
         let mut frag_options = vert_options.clone();
@@ -51,6 +55,7 @@ impl CompileShader<MSL> for NagaReflect {
                 allow_and_force_point_size: false,
                 vertex_pulling_transform: false,
                 vertex_buffer_mappings: vec![],
+                binding_array_length_map: Default::default(),
             };
 
             let msl = naga::back::msl::write_string(&module, &info, &options, &pipeline_options)?;
diff --git a/librashader-runtime-d3d11/src/filter_chain.rs b/librashader-runtime-d3d11/src/filter_chain.rs
@@ -223,7 +223,8 @@ impl FilterChainD3D11 {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
 
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
 
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -588,7 +589,10 @@ impl FilterChainD3D11 {
 
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
diff --git a/librashader-runtime-d3d12/src/filter_chain.rs b/librashader-runtime-d3d12/src/filter_chain.rs
@@ -431,7 +431,8 @@ impl FilterChainD3D12 {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
 
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
 
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -802,7 +803,10 @@ impl FilterChainD3D12 {
         // swap output and feedback **before** recording command buffers
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
@@ -889,31 +893,28 @@ impl FilterChainD3D12 {
 
                     if target.max_mipmap > 1 && !self.disable_mipmaps {
                         // barriers don't get disposed because the context is OutlivesFrame
-                        let (residuals, _residual_barriers) =
-                            self.common.mipmap_gen.mipmapping_context(
-                                cmd,
-                                &mut self.mipmap_heap,
-                                |ctx| {
-                                    ctx.generate_mipmaps::<OutlivesFrame, _>(
-                                        &target.resource,
-                                        target.max_mipmap,
-                                        target.size,
-                                        target.format.into(),
-                                    )?;
-                                    Ok::<(), FilterChainError>(())
-                                },
-                            )?;
+                        let (residuals, _residual_barriers) = self
+                            .common
+                            .mipmap_gen
+                            .mipmapping_context(cmd, &mut self.mipmap_heap, |ctx| {
+                                ctx.generate_mipmaps::<OutlivesFrame, _>(
+                                    &target.resource,
+                                    target.max_mipmap,
+                                    target.size,
+                                    target.format.into(),
+                                )?;
+                                Ok::<(), FilterChainError>(())
+                            })?;
 
                         self.residuals.dispose_mipmap_handles(residuals);
                     }
 
                     self.residuals.dispose_output(view.descriptor);
-                    self.common.output_textures[index] =
-                        Some(target.create_shader_resource_view(
-                            &mut self.staging_heap,
-                            pass.meta.filter,
-                            pass.meta.wrap_mode,
-                        )?);
+                    self.common.output_textures[index] = Some(target.create_shader_resource_view(
+                        &mut self.staging_heap,
+                        pass.meta.filter,
+                        pass.meta.wrap_mode,
+                    )?);
                     source = self.common.output_textures[index].as_ref().unwrap().clone();
                     return Ok(());
                 }
diff --git a/librashader-runtime-d3d12/tests/hello_triangle/mod.rs b/librashader-runtime-d3d12/tests/hello_triangle/mod.rs
@@ -494,7 +494,7 @@ pub mod d3d12_hello_triangle {
         }
 
         fn window_size(&self) -> (i32, i32) {
-            (3840 , 2160 )
+            (3840, 2160)
         }
 
         fn render(&mut self) {
diff --git a/librashader-runtime-d3d9/src/filter_chain.rs b/librashader-runtime-d3d9/src/filter_chain.rs
@@ -264,7 +264,8 @@ impl FilterChainD3D9 {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
 
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
 
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -461,7 +462,10 @@ impl FilterChainD3D9 {
 
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
diff --git a/librashader-runtime-gl/src/filter_chain/chain.rs b/librashader-runtime-gl/src/filter_chain/chain.rs
@@ -203,7 +203,8 @@ impl<T: GLInterface> FilterChainImpl<T> {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
 
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
 
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -471,7 +472,10 @@ impl<T: GLInterface> FilterChainImpl<T> {
         // swap feedback framebuffers with output
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
diff --git a/librashader-runtime-mtl/src/filter_chain.rs b/librashader-runtime-mtl/src/filter_chain.rs
@@ -342,7 +342,8 @@ impl FilterChainMetal {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
         //
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
         //
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -446,7 +447,10 @@ impl FilterChainMetal {
         // swap output and feedback **before** recording command buffers
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
diff --git a/librashader-runtime-vk/src/filter_chain.rs b/librashader-runtime-vk/src/filter_chain.rs
@@ -471,7 +471,8 @@ impl FilterChainVulkan {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
 
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
 
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -738,7 +739,10 @@ impl FilterChainVulkan {
         // swap output and feedback **before** recording command buffers
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
@@ -859,8 +863,7 @@ impl FilterChainVulkan {
                     None
                 };
 
-                let output_image =
-                    OutputImage::new(&self.vulkan.device, viewport.output.clone())?;
+                let output_image = OutputImage::new(&self.vulkan.device, viewport.output.clone())?;
                 let out = RenderTarget::viewport_with_output(&output_image, viewport);
 
                 let residual_fb = pass.draw(
diff --git a/librashader-runtime-wgpu/src/filter_chain.rs b/librashader-runtime-wgpu/src/filter_chain.rs
@@ -259,7 +259,8 @@ impl FilterChainWgpu {
         let (output_framebuffers, output_textures) = framebuffer_init.init_output_framebuffers()?;
         //
         // initialize feedback framebuffers
-        let (feedback_framebuffers, feedback_textures) = framebuffer_init.init_feedback_framebuffers()?;
+        let (feedback_framebuffers, feedback_textures) =
+            framebuffer_init.init_feedback_framebuffers()?;
         //
         // initialize history
         let (history_framebuffers, history_textures) = framebuffer_init.init_history()?;
@@ -486,7 +487,10 @@ impl FilterChainWgpu {
         // swap output and feedback **before** recording command buffers
         for index in 0..passes_len {
             if self.feedback_framebuffers.contains(index) {
-                std::mem::swap(&mut self.output_framebuffers[index], &mut self.feedback_framebuffers[index]);
+                std::mem::swap(
+                    &mut self.output_framebuffers[index],
+                    &mut self.feedback_framebuffers[index],
+                );
             }
         }
 
diff --git a/librashader-runtime-wgpu/src/graphics_pipeline.rs b/librashader-runtime-wgpu/src/graphics_pipeline.rs
@@ -152,7 +152,7 @@ impl PipelineLayoutObjects {
                 module: &self.vertex,
                 entry_point: Some(&self.vertex_entry_name),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
-                buffers: &[VertexBufferLayout {
+                buffers: &[Some(VertexBufferLayout {
                     array_stride: std::mem::size_of::<VertexInput>() as wgpu::BufferAddress,
                     step_mode: wgpu::VertexStepMode::Vertex,
                     attributes: &[
@@ -169,7 +169,7 @@ impl PipelineLayoutObjects {
                             shader_location: 1,
                         },
                     ],
-                }],
+                })],
             },
             fragment: Some(wgpu::FragmentState {
                 module: &self.fragment,
diff --git a/librashader-runtime/src/framebuffer.rs b/librashader-runtime/src/framebuffer.rs
@@ -63,7 +63,11 @@ impl<F> FramebufferPool<F> {
         for pass in 0..n {
             let mut event = freed_at[pass];
             while event != usize::MAX {
-                let Event { slot, key, next_slot } = events[event];
+                let Event {
+                    slot,
+                    key,
+                    next_slot,
+                } = events[event];
                 free.entry(key).or_default().push(slot);
                 event = next_slot;
             }
@@ -77,7 +81,11 @@ impl<F> FramebufferPool<F> {
 
             self.slots[pass] = Slot::new(slot);
             let free_at = self.last_use[pass] + 1;
-            events.push(Event { slot, key, next_slot: freed_at[free_at] });
+            events.push(Event {
+                slot,
+                key,
+                next_slot: freed_at[free_at],
+            });
             freed_at[free_at] = events.len() - 1;
         }
     }
@@ -222,7 +230,6 @@ fn init_feedback_framebuffers<F, I, E>(
     owned_generator: impl Fn() -> Result<F, E>,
     input_generator: impl Fn() -> I,
 ) -> Result<(FramebufferPool<F>, Box<[I]>), E> {
-
     // assign feedback slots according to the usage mask
     fn assign_slots(mask: &BitSet, filters_count: usize) -> (usize, Box<[Slot]>) {
         let mut slot_of_pass = vec![Slot::NONE; filters_count];
diff --git a/librashader/src/lib.rs b/librashader/src/lib.rs
@@ -82,7 +82,7 @@ pub mod presets {
             for (key, value) in source.parameters {
                 map.insert(key, value);
             }
-        } 
+        }
         for parameter in &preset.parameters {
             if let Some(meta) = map.get_mut(&parameter.name) {
                 meta.initial = parameter.value;
diff --git a/test/webgpu-example/Cargo.lock b/test/webgpu-example/Cargo.lock
diff --git a/test/webgpu-example/Cargo.toml b/test/webgpu-example/Cargo.toml
diff --git a/test/webgpu-example/src/lib.rs b/test/webgpu-example/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ pub mod d3d12_hello_triangle {`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`fn window_size(&self) -> (i32, i32) {`
`497`		`- (3840 , 2160 )`
	`497`	`+ (3840, 2160)`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`fn render(&mut self) {`