diff --git a/Cargo.toml b/Cargo.toml index aa30edf..e49778e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,9 @@ wgpu_serde = ["wgpu/serde"] indexmap = "2.2" pollster = "0.3" image = "0.25" -bytemuck = { version = "1.15", features = ["derive"] } -wgpu = { version = "0.19", default_features = true, features = ["naga-ir"] } -winit = { version = "0.29", features = ["rwh_05"] } +bytemuck = { version = "1.16", features = ["derive"] } +wgpu = { version = "0.20", default-features = true, features = ["naga-ir"] } +winit = { version = "0.29", features = [] } glam = "0.27" path-clean = "1.0.1" notify = "6.1" @@ -28,17 +28,17 @@ flume = "0.11" log = "0.4" # Optional Egui -egui = { version = "0.27", optional = true } -egui-wgpu = { version = "0.27", optional = true } -egui-winit = { version = "0.27", optional = true } -egui_extras = { version = "0.27", optional = true } -egui_demo_lib = { version = "0.27", optional = true } -egui_plot = { version = "0.27", optional = true } +egui = { version = "0.28", optional = true } +egui-wgpu = { version = "0.28", optional = true } +egui-winit = { version = "0.28", optional = true } +egui_extras = { version = "0.28", optional = true } +egui_demo_lib = { version = "0.28", optional = true } +egui_plot = { version = "0.28", optional = true } [dev-dependencies] -egui_demo_lib = { version = "0.27" } -winit_input_helper = "0.15" -rapier2d = { version = "0.19", features = ["default", "debug-render"] } +egui_demo_lib = { version = "0.28" } +winit_input_helper = "0.16" +rapier2d = { version = "0.21.0", features = ["default", "debug-render"] } rand = "0.8" [lints.clippy] diff --git a/examples/fluid_sim/app.rs b/examples/fluid_sim/app.rs index d861ebb..c014db5 100644 --- a/examples/fluid_sim/app.rs +++ b/examples/fluid_sim/app.rs @@ -12,7 +12,7 @@ use glass::{ GlassApp, GlassContext, RenderData, }; use wgpu::{CommandBuffer, StoreOp}; -use winit::keyboard::KeyCode; +use winit::{event::MouseButton, keyboard::KeyCode}; use winit_input_helper::WinitInputHelper; use crate::{ @@ -123,13 +123,13 @@ impl GlassApp for FluidSimApp { ], &self.camera, ); - if self.input.mouse_pressed(0) { + if self.input.mouse_pressed(MouseButton::Left) { self.fluid_scene.drag(pos, true); } - if self.input.mouse_held(0) { + if self.input.mouse_held(MouseButton::Left) { self.fluid_scene.drag(pos, false); } - if self.input.mouse_released(0) { + if self.input.mouse_released(MouseButton::Left) { self.fluid_scene.end_drag(); } } diff --git a/examples/fluid_sim/circle_pipeline.rs b/examples/fluid_sim/circle_pipeline.rs index 0ea2fab..045be8a 100644 --- a/examples/fluid_sim/circle_pipeline.rs +++ b/examples/fluid_sim/circle_pipeline.rs @@ -72,11 +72,13 @@ impl CirclePipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(color_target_state)], }), primitive: wgpu::PrimitiveState { diff --git a/examples/fluid_sim/rectangle_pipeline.rs b/examples/fluid_sim/rectangle_pipeline.rs index 89595ea..962a5ce 100644 --- a/examples/fluid_sim/rectangle_pipeline.rs +++ b/examples/fluid_sim/rectangle_pipeline.rs @@ -72,11 +72,13 @@ impl RectanglePipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(color_target_state)], }), primitive: wgpu::PrimitiveState { diff --git a/examples/game_of_life/main.rs b/examples/game_of_life/main.rs index 5c0f2c2..81e7a46 100644 --- a/examples/game_of_life/main.rs +++ b/examples/game_of_life/main.rs @@ -562,6 +562,7 @@ fn create_game_of_life_pipeline( layout: Some(&game_of_life_init_layout), module: &game_of_life_shader, entry_point: "init", + compilation_options: Default::default(), }); let game_of_life_layout = @@ -582,6 +583,7 @@ fn create_game_of_life_pipeline( layout: Some(&game_of_life_layout), module: &game_of_life_shader, entry_point: "update", + compilation_options: Default::default(), }); let draw_layout = context @@ -601,6 +603,7 @@ fn create_game_of_life_pipeline( layout: Some(&draw_layout), module: &brush_shader, entry_point: "main", + compilation_options: Default::default(), }); (init_pipeline, update_pipeline, draw_pipeline) diff --git a/examples/shader_with_includes/main.rs b/examples/shader_with_includes/main.rs index c8f56fb..599a16b 100644 --- a/examples/shader_with_includes/main.rs +++ b/examples/shader_with_includes/main.rs @@ -113,11 +113,13 @@ fn create_triangle_pipeline(context: &GlassContext) -> RenderPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(TextureFormat::Bgra8UnormSrgb.into())], }), primitive: PrimitiveState::default(), diff --git a/src/pipelines/bloom/pipeline.rs b/src/pipelines/bloom/pipeline.rs index fbf2235..94c221e 100644 --- a/src/pipelines/bloom/pipeline.rs +++ b/src/pipelines/bloom/pipeline.rs @@ -125,11 +125,13 @@ impl BloomPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleTexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "downsample_first", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: BLOOM_TEXTURE_FORMAT, blend: None, @@ -147,11 +149,13 @@ impl BloomPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleTexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "downsample", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: BLOOM_TEXTURE_FORMAT, blend: None, @@ -183,11 +187,13 @@ impl BloomPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleTexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "upsample", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: BLOOM_TEXTURE_FORMAT, blend: Some(BlendState { @@ -213,11 +219,13 @@ impl BloomPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleTexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "upsample", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: FINAL_TEXTURE_FORMAT, blend: Some(BlendState { diff --git a/src/pipelines/line/pipeline.rs b/src/pipelines/line/pipeline.rs index 9492ad0..d6648ed 100644 --- a/src/pipelines/line/pipeline.rs +++ b/src/pipelines/line/pipeline.rs @@ -49,11 +49,13 @@ impl LinePipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[ColoredVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(color_target_state)], }), primitive: wgpu::PrimitiveState { diff --git a/src/pipelines/paste/pipeline.rs b/src/pipelines/paste/pipeline.rs index ed9aceb..5600bb9 100644 --- a/src/pipelines/paste/pipeline.rs +++ b/src/pipelines/paste/pipeline.rs @@ -88,11 +88,13 @@ impl PastePipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[TexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fragment", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: target_texture_format, blend: Some(wgpu::BlendState { diff --git a/src/pipelines/quad/pipeline.rs b/src/pipelines/quad/pipeline.rs index af2172a..ea15d44 100644 --- a/src/pipelines/quad/pipeline.rs +++ b/src/pipelines/quad/pipeline.rs @@ -80,11 +80,13 @@ impl QuadPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[TexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(color_target_state)], }), primitive: wgpu::PrimitiveState { diff --git a/src/pipelines/tonemapping/pipeline.rs b/src/pipelines/tonemapping/pipeline.rs index c31321b..490adfb 100644 --- a/src/pipelines/tonemapping/pipeline.rs +++ b/src/pipelines/tonemapping/pipeline.rs @@ -70,11 +70,13 @@ impl TonemappingPipeline { vertex: wgpu::VertexState { module: &shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[SimpleTexturedVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fragment", + compilation_options: Default::default(), targets: &[Some(ColorTargetState { format: TONEMAPPING_TEXTURE_FORMAT, blend: None,