Update wgpu 0.29 (#9)

* Update wgpu 0.29

* Allow collapsible match

Author: hakolao

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glass"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -14,18 +14,18 @@ indexmap = "2.9"
 pollster = "0.4"
 image = "0.25"
 bytemuck = { version = "1.20", features = ["derive"] }
-wgpu = { version = "27.0", features = ["naga-ir"] }
+wgpu = { version = "29.0", features = ["naga-ir"] }
 winit = { version = "0.30" }
 
 [dev-dependencies]
-egui = { version = "0.33" }
-egui-wgpu = { version = "0.33" }
-egui-winit = { version = "0.33" }
-egui_extras = { version = "0.33" }
-egui_demo_lib = { version = "0.33" }
+egui = { version = "0.34" }
+egui-wgpu = { version = "0.34" }
+egui-winit = { version = "0.34" }
+egui_extras = { version = "0.34" }
+egui_demo_lib = { version = "0.34" }
 rapier2d = { version = "0.31.0", features = ["default", "debug-render"] }
-rand = "0.9"
-glam = "0.30"
+rand = "0.10"
+glam = "0.32"
 
 [lints.clippy]
 blocks_in_conditions = "allow"
@@ -34,6 +34,7 @@ self_named_constructors = "allow"
 too_long_first_doc_paragraph = "allow"
 uninlined_format_args = "allow"
 default_constructed_unit_structs = "allow"
+collapsible_match = "allow"
 
 [profile.dev]
 opt-level = 3

examples/egui_gui.rs

@@ -6,7 +6,7 @@ use glass::{
     window::{GlassWindow, RenderData, WindowConfig},
     Glass, GlassApp, GlassConfig, GlassContext, GlassError,
 };
-use wgpu::{CommandBuffer, Device, Queue, StoreOp};
+use wgpu::{CommandBuffer, StoreOp};
 use winit::{event::WindowEvent, event_loop::ActiveEventLoop, window::WindowId};
 
 fn main() -> Result<(), GlassError> {
@@ -39,13 +39,9 @@ impl GlassApp for GuiApp {
     }
 
     fn update(&mut self, context: &mut GlassContext) {
-        let device = context.device();
-        let queue = context.queue();
         context
-            .primary_render_window()
-            .render_default(device, queue, self, |app, render_data| {
-                render_egui(app, device, queue, render_data)
-            });
+            .primary_render_window_mut()
+            .render_default(self, render_egui);
     }
 }
 
@@ -112,13 +108,10 @@ fn update_egui_with_winit_event(
     }
 }
 
-fn render_egui(
-    app: &mut GuiApp,
-    device: &Device,
-    queue: &Queue,
-    render_data: RenderData,
-) -> Option<Vec<CommandBuffer>> {
+fn render_egui(app: &mut GuiApp, render_data: RenderData) -> Option<Vec<CommandBuffer>> {
     let window = render_data.window;
+    let device = window.device_context().device();
+    let queue = window.device_context().queue();
     let view = render_data
         .frame
         .texture
@@ -136,7 +129,7 @@ fn render_egui(
         textures_delta,
         pixels_per_point,
         ..
-    } = egui_ctx.run(raw_input, |egui_ctx| {
+    } = egui_ctx.run_ui(raw_input, |egui_ctx| {
         // Ui content
         ui_app.ui(egui_ctx);
     });
@@ -183,6 +176,7 @@ fn render_egui(
                 depth_stencil_attachment: None,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
         // Here you would render your scene
         // Render Egui

examples/game_of_life/draw.wgsl

@@ -3,7 +3,7 @@ struct PushConstants {
     draw_end: vec2<f32>,
     draw_radius: f32,
 }
-var<push_constant> pc: PushConstants;
+var<immediate> pc: PushConstants;
 
 @group(0) @binding(0)
 var data_in: texture_storage_2d<rgba16float, read_write>;

examples/game_of_life/game_of_life.wgsl

@@ -3,7 +3,7 @@ struct PushConstants {
     draw_end: vec2<f32>,
     draw_radius: f32,
 }
-var<push_constant> pc: PushConstants;
+var<immediate> pc: PushConstants;
 
 @group(0) @binding(0)
 var image: texture_storage_2d<rgba16float, read_write>;

examples/game_of_life/main.rs

@@ -12,8 +12,7 @@ use glass::{
 use wgpu::{
     Backends, BindGroup, BindGroupDescriptor, CommandBuffer, CommandEncoder, ComputePassDescriptor,
     ComputePipeline, ComputePipelineDescriptor, Extent3d, InstanceFlags, Limits, MemoryHints,
-    PowerPreference, PresentMode, PushConstantRange, ShaderStages, StorageTextureAccess, StoreOp,
-    TextureFormat, TextureUsages,
+    PowerPreference, PresentMode, StorageTextureAccess, StoreOp, TextureFormat, TextureUsages,
 };
 use winit::{
     event::{ElementState, MouseButton, WindowEvent},
@@ -37,10 +36,10 @@ fn config() -> GlassConfig {
         device_config: DeviceConfig {
             power_preference: PowerPreference::HighPerformance,
             memory_hints: MemoryHints::Performance,
-            features: wgpu::Features::PUSH_CONSTANTS
+            features: wgpu::Features::IMMEDIATES
                 | wgpu::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES,
             limits: Limits {
-                max_push_constant_size: 128,
+                max_immediate_size: 128,
                 ..Limits::default()
             },
             backends: Backends::all(),
@@ -107,12 +106,9 @@ impl GlassApp for GameOfLifeApp {
     fn update(&mut self, context: &mut GlassContext) {
         run_update(self, context);
 
-        context.primary_render_window().render_default(
-            context.device(),
-            context.queue(),
-            self,
-            render,
-        );
+        context
+            .primary_render_window_mut()
+            .render_default(self, render);
     }
 }
 
@@ -240,6 +236,7 @@ fn render(app: &mut GameOfLifeApp, render_data: RenderData) -> Option<Vec<Comman
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
         quad_pipeline.draw(
             &mut rpass,
@@ -297,7 +294,7 @@ fn draw_game_of_life(
     let pc = GameOfLifePushConstants::new(start, end, 10.0);
     cpass.set_pipeline(draw_pipeline);
     cpass.set_bind_group(0, &data.draw_bind_group, &[]);
-    cpass.set_push_constants(0, bytemuck::cast_slice(&[pc]));
+    cpass.set_immediates(0, bytemuck::cast_slice(&[pc]));
     cpass.dispatch_workgroups(WIDTH / 8, HEIGHT / 8, 1);
 }
 
@@ -339,7 +336,7 @@ fn update_game_of_life(
     let pc = GameOfLifePushConstants::new(Vec2::ZERO, Vec2::ZERO, 0.0);
     cpass.set_pipeline(game_of_life_pipeline);
     cpass.set_bind_group(0, &update_bind_group, &[]);
-    cpass.set_push_constants(0, bytemuck::cast_slice(&[pc]));
+    cpass.set_immediates(0, bytemuck::cast_slice(&[pc]));
     cpass.dispatch_workgroups(WIDTH / 8, HEIGHT / 8, 1);
 
     app.count += 1;
@@ -366,7 +363,7 @@ fn init_game_of_life(app: &mut GameOfLifeApp, context: &GlassContext) {
         });
         cpass.set_pipeline(init_pipeline);
         cpass.set_bind_group(0, &data.init_bind_group, &[]);
-        cpass.set_push_constants(
+        cpass.set_immediates(
             0,
             bytemuck::cast_slice(&[GameOfLifePushConstants::new(Vec2::ZERO, Vec2::ZERO, 0.0)]),
         );
@@ -535,11 +532,8 @@ fn create_game_of_life_pipeline(
             .device()
             .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("Game of Life Init Layout"),
-                bind_group_layouts: &[&bg_layout],
-                push_constant_ranges: &[PushConstantRange {
-                    stages: ShaderStages::COMPUTE,
-                    range: 0..std::mem::size_of::<GameOfLifePushConstants>() as u32,
-                }],
+                bind_group_layouts: &[Some(&bg_layout)],
+                immediate_size: size_of::<GameOfLifePushConstants>() as u32,
             });
     let init_pipeline = context
         .device()
@@ -557,11 +551,8 @@ fn create_game_of_life_pipeline(
             .device()
             .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("Game of Life Layout"),
-                bind_group_layouts: &[&bg_layout],
-                push_constant_ranges: &[PushConstantRange {
-                    stages: ShaderStages::COMPUTE,
-                    range: 0..std::mem::size_of::<GameOfLifePushConstants>() as u32,
-                }],
+                bind_group_layouts: &[Some(&bg_layout)],
+                immediate_size: size_of::<GameOfLifePushConstants>() as u32,
             });
     let update_pipeline = context
         .device()
@@ -578,11 +569,8 @@ fn create_game_of_life_pipeline(
         .device()
         .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: Some("Draw Layout"),
-            bind_group_layouts: &[&dr_layout],
-            push_constant_ranges: &[PushConstantRange {
-                stages: ShaderStages::COMPUTE,
-                range: 0..std::mem::size_of::<GameOfLifePushConstants>() as u32,
-            }],
+            bind_group_layouts: &[Some(&dr_layout)],
+            immediate_size: size_of::<GameOfLifePushConstants>() as u32,
         });
     let draw_pipeline = context
         .device()

examples/hello_world.rs

@@ -16,11 +16,8 @@ struct HelloWorld;
 
 impl GlassApp for HelloWorld {
     fn update(&mut self, _context: &mut GlassContext) {
-        _context.primary_render_window().render_default(
-            _context.device(),
-            _context.queue(),
-            self,
-            |_, _| None,
-        );
+        _context
+            .primary_render_window_mut()
+            .render_default(self, |_, _| None);
     }
 }

examples/lines.rs

@@ -19,7 +19,7 @@ fn config() -> GlassConfig {
     GlassConfig {
         device_config: DeviceConfig {
             limits: Limits {
-                max_push_constant_size: 128,
+                max_immediate_size: 128,
                 ..Default::default()
             },
             features: Features::POLYGON_MODE_LINE,
@@ -223,13 +223,8 @@ impl GlassApp for LineApp {
             narrow_phase,
         );
 
-        let window = _context.primary_render_window();
-        window.render_default(
-            _context.device(),
-            _context.queue(),
-            self,
-            add_render_commands,
-        );
+        let window = _context.primary_render_window_mut();
+        window.render_default(self, add_render_commands);
     }
 }
 
@@ -263,6 +258,7 @@ fn add_render_commands(app: &mut LineApp, render_data: RenderData) -> Option<Vec
         depth_stencil_attachment: None,
         timestamp_writes: None,
         occlusion_query_set: None,
+        multiview_mask: None,
     });
     for line in lines.lines.iter() {
         line_pipeline.draw(&mut rpass, view_proj.to_cols_array_2d(), *line);

examples/multiple_windows/main.rs

@@ -69,10 +69,8 @@ impl GlassApp for MultiWindowApp {
     }
 
     fn update(&mut self, context: &mut GlassContext) {
-        let device = context.device_arc();
-        let queue = context.queue_arc();
-        for (_, window) in context.windows().iter() {
-            window.render_default(&device, &queue, self, render);
+        for (_, window) in context.windows().iter_mut() {
+            window.render_default(self, render);
         }
     }
 }
@@ -104,6 +102,7 @@ fn render(_app: &mut MultiWindowApp, render_data: RenderData) -> Option<Vec<Comm
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
     }
     None

examples/quad/main.rs

@@ -36,7 +36,7 @@ fn config() -> GlassConfig {
         device_config: DeviceConfig {
             limits: Limits {
                 // Needed for push constants
-                max_push_constant_size: 128,
+                max_immediate_size: 128,
                 ..Default::default()
             },
             ..DeviceConfig::performance()
@@ -66,12 +66,9 @@ impl GlassApp for TreeApp {
     }
 
     fn update(&mut self, context: &mut GlassContext) {
-        context.primary_render_window().render_default(
-            context.device(),
-            context.queue(),
-            self,
-            render,
-        );
+        context
+            .primary_render_window_mut()
+            .render_default(self, render);
     }
 }
 
@@ -116,6 +113,7 @@ fn render(app: &mut TreeApp, render_data: RenderData) -> Option<Vec<CommandBuffe
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
         quad_pipeline.draw(
             &mut rpass,

examples/sand/main.rs

@@ -142,12 +142,9 @@ impl GlassApp for SandSim {
         self.grid.simulate();
         self.grid.update_texture(context.queue());
 
-        context.primary_render_window().render_default(
-            context.device(),
-            context.queue(),
-            self,
-            render,
-        );
+        context
+            .primary_render_window_mut()
+            .render_default(self, render);
 
         self.timer.update();
         if let Some(w) = context.primary_render_window_maybe() {
@@ -194,6 +191,7 @@ fn render(app: &mut SandSim, render_data: RenderData) -> Option<Vec<CommandBuffe
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
         quad_pipeline.draw(
             &mut rpass,
@@ -242,7 +240,7 @@ fn config() -> GlassConfig {
         device_config: DeviceConfig {
             limits: Limits {
                 // Needed for push constants
-                max_push_constant_size: 128,
+                max_immediate_size: 128,
                 ..Default::default()
             },
             ..DeviceConfig::default()