Update to Wgpu 0.18

Cargo.toml

@@ -13,8 +13,8 @@ default-members = ["neothesia"]
 resolver = "2"
 
 [workspace.dependencies]
-wgpu = "0.17.1"
-glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "20f0f8fa80e0d0df4c63634ce9176fa489546ca9" }
+wgpu = "0.18"
+glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "2caa9fc5e5923c1d827d177c3619cab7e9885b85" }
 log = "0.4"
 bytemuck = { version = "1.5", features = ["derive"] }
 env_logger = "0.10"

neothesia-cli/src/main.rs

@@ -148,10 +148,12 @@ impl Recorder {
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Clear(bg_color),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
                     })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
             self.waterfall.render(&self.transform_uniform, &mut rpass);

neothesia/Cargo.toml

@@ -38,12 +38,12 @@ oxisynth = { version = "0.0.3", optional = true }
 midi-file = { workspace = true }
 midi-io = { path = "../midi-io" }
 
-iced_style = {git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb"}
-iced_graphics = {git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb"}
-iced_core = {git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb"}
-iced_runtime = {git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb"}
-iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb", features = ["image"] }
-iced_widget = { git = "https://github.com/iced-rs/iced.git", rev="bc9bb28b1ccd1248d63ccdfef2f57d7aa837abbb", features = ["image"] }
+iced_style = {git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae"}
+iced_graphics = {git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae"}
+iced_core = {git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae"}
+iced_runtime = {git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae"}
+iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae", features = ["image"] }
+iced_widget = { git = "https://github.com/iced-rs/iced.git", rev="86b877517feb15b2155c6cfef29246a3f281c8ae", features = ["image"] }
 
 [[bin]]
 name = "neothesia"

neothesia/src/main.rs

@@ -179,11 +179,13 @@ impl Neothesia {
                             resolve_target: None,
                             ops: wgpu::Operations {
                                 load: wgpu::LoadOp::Clear(bg_color),
-                                store: true,
+                                store: wgpu::StoreOp::Store,
                             },
                         })],
 
                         depth_stencil_attachment: None,
+                        timestamp_writes: None,
+                        occlusion_query_set: None,
                     });
 
             self.game_scene.render(&self.target.transform, &mut rpass);
@@ -277,6 +279,8 @@ fn init(builder: winit::window::WindowBuilder) -> (EventLoop<NeothesiaEvent>, Ta
     let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
         backends: wgpu_jumpstart::default_backends(),
         dx12_shader_compiler: wgpu::Dx12Compiler::default(),
+        flags: wgpu::InstanceFlags::default(),
+        gles_minor_version: wgpu::Gles3MinorVersion::Automatic,
     });
 
     let size = window.inner_size();

neothesia/src/scene/menu_scene/iced_menu/mod.rs

@@ -465,7 +465,7 @@ impl<'a> Step {
                     PlayerConfig::Human => 2,
                 };
 
-                let color = if (track.has_drums && !track.has_other_than_drums) || !visible {
+                let color = if !visible {
                     iced_core::Color::from_rgb8(102, 102, 102)
                 } else {
                     let color_id = track.track_color_id % target.config.color_schema.len();
@@ -500,14 +500,20 @@ impl<'a> Step {
                     .active(active)
                     .active_color(color)
                     .build();
+
                 let card = track_card::track_card()
                     .title(name)
                     .subtitle(format!("{} Notes", track.notes.len()))
                     .track_color(color)
-                    .body(body)
-                    .on_icon_press(Message::TrackVisibilityConfig(track.track_id, !visible))
-                    .build();
-                tracks.push(card.into());
+                    .body(body);
+
+                let card = if track.has_drums && !track.has_other_than_drums {
+                    card
+                } else {
+                    card.on_icon_press(Message::TrackVisibilityConfig(track.track_id, !visible))
+                };
+
+                tracks.push(card.build().into());
             }
         }
 

neothesia/src/song.rs

@@ -1,7 +1,8 @@
-#[derive(Debug, Default, Clone)]
+use midi_file::MidiTrack;
+
+#[derive(Debug, Clone)]
 pub enum PlayerConfig {
     Mute,
-    #[default]
     Auto,
     Human,
 }
@@ -13,24 +14,24 @@ pub struct TrackConfig {
     pub visible: bool,
 }
 
-impl TrackConfig {
-    fn new(track_id: usize) -> Self {
-        Self {
-            track_id,
-            player: PlayerConfig::default(),
-            visible: true,
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct SongConfig {
     pub tracks: Box<[TrackConfig]>,
 }
 
 impl SongConfig {
-    fn new(tracks_count: usize) -> Self {
-        let tracks: Vec<_> = (0..tracks_count).map(TrackConfig::new).collect();
+    fn new(tracks: &[MidiTrack]) -> Self {
+        let tracks: Vec<_> = tracks
+            .iter()
+            .map(|t| {
+                let is_drums = t.has_drums && !t.has_other_than_drums;
+                TrackConfig {
+                    track_id: t.track_id,
+                    player: PlayerConfig::Auto,
+                    visible: !is_drums,
+                }
+            })
+            .collect();
         Self {
             tracks: tracks.into(),
         }
@@ -45,7 +46,7 @@ pub struct Song {
 
 impl Song {
     pub fn new(file: midi_file::MidiFile) -> Self {
-        let config = SongConfig::new(file.tracks.len());
+        let config = SongConfig::new(&file.tracks);
         Self { file, config }
     }
 }

wgpu-jumpstart/src/gpu.rs

@@ -103,10 +103,12 @@ impl Gpu {
                         b: rgb[2] as f64,
                         a: 1.0,
                     }),
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 },
             })],
             depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
     }