wgpu 30

Cargo.toml

@@ -32,8 +32,8 @@ objc2 = { version = "0.6" }
 glow = { version = "0.17.0" }
 glfw = { version = "0.59.0" }
 
-wgpu = { version = "29.0.3", default-features = false }
-wgpu-types = { version = "29.0.3" }
+wgpu = { version = "30.0.0", default-features = false }
+wgpu-types = { version = "30.0.0" }
 
 clap = { version = "=4.3.0", features = ["derive"] }
 rayon = { version = "1.10.0"}

librashader-cli/src/render/wgpu.rs

@@ -159,18 +159,19 @@ impl RenderTest for Wgpu {
             .slice(..)
             .map_async(wgpu::MapMode::Read, move |r| {
                 if r.is_ok() {
-                    let buffer = capturable.slice(..).get_mapped_range();
-                    let mut pixels = pixels_async.lock();
-                    pixels.resize(buffer.len(), 0);
+                    if let Ok(buffer) = capturable.slice(..).get_mapped_range() {
+                        let mut pixels = pixels_async.lock();
+                        pixels.resize(buffer.len(), 0);
 
-                    let mut cursor = Cursor::new(pixels.deref_mut());
-                    for chunk in buffer.chunks(buffer_dimensions.padded_bytes_per_row) {
-                        cursor
-                            .write_all(&chunk[..buffer_dimensions.unpadded_bytes_per_row])
-                            .unwrap()
-                    }
+                        let mut cursor = Cursor::new(pixels.deref_mut());
+                        for chunk in buffer.chunks(buffer_dimensions.padded_bytes_per_row) {
+                            cursor
+                                .write_all(&chunk[..buffer_dimensions.unpadded_bytes_per_row])
+                                .unwrap()
+                        }
 
-                    cursor.into_inner();
+                        cursor.into_inner();
+                    }
                 }
                 capturable.unmap();
             });
@@ -204,6 +205,7 @@ impl Wgpu {
                     power_preference: wgpu::PowerPreference::default(),
                     compatible_surface: None,
                     force_fallback_adapter: false,
+                    apply_limit_buckets: false,
                 })
                 .await?;
 

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" }
 

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)?;

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],
+                );
             }
         }