Update deps

DCNick3 · Oct 20, 2023 · 72c7b9e · 72c7b9e
1 parent d0730f3
commit 72c7b9e
Show file tree

Hide file tree

Showing 11 changed files with 1,034 additions and 928 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,13 +19,19 @@ glam = "0.24.0"
 enum-map = "3.0.0-0.gat.0"
 #enum-map = { path = "/home/dcnick3/git_cloned/enum-map/enum-map" }
 smallvec = { git = "https://github.com/servo/rust-smallvec.git", rev = "98b49e4d974c20f6d44a0804071074f267be0d88" }
-wgpu = "0.16.1"
-kira = { version = "0.8.3", default-features = false }
-egui = "0.22.0"
+wgpu = "0.17.0"
+kira = { version = "0.8.5", default-features = false }
+winit = "0.28.7"
+
+# egui used for debug overlays
+egui = "0.23.0"
+egui-wgpu = "0.23.0"
+
 image = { version = "0.24.5", default-features = false }
 anyhow = "1.0.69"
 bevy_utils = "0.11.2"
 itertools = "0.11.0"
+binrw = "0.12.0"
 
 [profile.release]
 debug = true

diff --git a/junk/Cargo.toml b/junk/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 regex = "1.7.0"
 once_cell = "1.16.0"
-binrw = "0.11.1"
+binrw = { workspace = true }
 derive_more = "0.99.17"
 clap = { version = "4.0.32", features = ["derive"] }
 image = { workspace = true }

diff --git a/shin-asm/Cargo.toml b/shin-asm/Cargo.toml
@@ -19,7 +19,7 @@ rustc-hash = "1.1.0"
 smol_str = "0.2.0"
 la-arena = "0.3.1"
 
-binrw = "0.11.2"
+binrw = { workspace = true }
 
 unicode-xid = "0.2.4"
 unic-emoji-char = "0.9.0"

diff --git a/shin-core/Cargo.toml b/shin-core/Cargo.toml
@@ -18,7 +18,7 @@ shin-derive = { path = "../shin-derive" }
 derive_more = "0.99.17"
 enum-map = { workspace = true }
 async-trait = "0.1.58"
-binrw = "0.11.1"
+binrw = { workspace = true }
 strum = { version = "0.25.0", features = ["derive"] }
 proc-bitfield = "0.3.0"
 derivative = "2.2.0"

diff --git a/shin-core/src/format/font.rs b/shin-core/src/format/font.rs
@@ -2,7 +2,7 @@
 
 use crate::format::lz77;
 use anyhow::anyhow;
-use binrw::{BinRead, BinResult, BinWrite, Endian, FilePtr32, VecArgs};
+use binrw::{BinRead, BinResult, BinWrite, Endian, VecArgs};
 use glam::{vec2, Vec2};
 use image::GrayImage;
 use std::borrow::Cow;
@@ -361,26 +361,17 @@ impl<G: GlyphTrait> BinRead for Font<G> {
         let mut glyphs = HashMap::new();
 
         for (character_index, &glyph_offset) in character_table.iter().enumerate() {
-            // we can't directly read FilePtr32 array because it's too large, the stack overflows
-            let mut glyph_offset: FilePtr32<G> = FilePtr32 {
-                ptr: glyph_offset,
-                value: None,
-            };
-            let known_glyph = known_glyph_offsets.contains_key(&glyph_offset.ptr);
-            if !known_glyph {
-                glyph_offset.after_parse(reader, endian, Default::default())?;
-            }
-
             let next_glyph_id = GlyphId(known_glyph_offsets.len() as u32);
             let glyph_id = *known_glyph_offsets
-                .entry(glyph_offset.ptr)
+                .entry(glyph_offset)
                 .or_insert(next_glyph_id);
             characters[character_index] = glyph_id;
 
             match glyphs.entry(glyph_id) {
                 Entry::Occupied(_) => continue,
                 Entry::Vacant(entry) => {
-                    entry.insert(glyph_offset.into_inner());
+                    reader.seek(SeekFrom::Start(glyph_offset as u64))?;
+                    entry.insert(G::read_options(reader, endian, Default::default())?);
                 }
             }
         }

diff --git a/shin-render/Cargo.toml b/shin-render/Cargo.toml
@@ -13,7 +13,7 @@ shin-core = { path = "../shin-core" }
 anyhow = { workspace = true }
 tracing = "0.1.37"
 
-winit = "0.28.1"
+winit = { workspace = true }
 wgpu = { workspace = true }
 # TODO: this can be reimplemented in shin-derive (I want to have my own traits for this anyways)
 wrld = "1.0.0"

diff --git a/shin-video/Cargo.toml b/shin-video/Cargo.toml
@@ -18,11 +18,11 @@ shin-audio = { path = "../shin-audio" }
 mp4 = "0.14.0"
 symphonia = { version = "0.5.2", features = ["aac"], default-features = false }
 
-gst = { package = "gstreamer", version = "0.20.7", optional = true }
-gst-app = { package = "gstreamer-app", version = "0.20.7", optional = true }
-gst-video = { package = "gstreamer-video", version = "0.20.7", optional = true }
+gst = { package = "gstreamer", version = "0.21.1", optional = true }
+gst-app = { package = "gstreamer-app", version = "0.21.1", optional = true }
+gst-video = { package = "gstreamer-video", version = "0.21.1", optional = true }
 
-tracing-gstreamer = { version = "0.5.0", optional = true }
+tracing-gstreamer = { version = "0.6.0", optional = true }
 
 wgpu = { workspace = true }
 kira = { workspace = true }
@@ -33,7 +33,7 @@ once_cell = "1.18.0"
 cfg-if = "1.0.0"
 bytes = "1.4.0"
 tracing = "0.1.37"
-which = "4.4.0"
+which = "5.0.0"
 
 async-process = "1.6.0"
 futures-lite = "1.12.0"
@@ -48,7 +48,7 @@ gstreamer = [
 ]
 
 [dev-dependencies]
-winit = "0.28.1"
+winit = { workspace = true }
 wgpu = { workspace = true, features = [] }
 kira = { workspace = true, features = ["cpal"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

diff --git a/shin-video/src/h264_decoder/y4m.rs b/shin-video/src/h264_decoder/y4m.rs
@@ -292,6 +292,8 @@ impl Default for Limits {
 }
 
 /// YUV4MPEG2 decoder.
+// gstreamer impl does not use YUV4MPEG2, but passes stuff directly in-memory
+#[cfg_attr(feature = "gstreamer", allow(unused))]
 pub struct Decoder<R: AsyncRead> {
     reader: BufReader<R>,
     params_buf: Vec<u8>,
@@ -300,6 +302,7 @@ pub struct Decoder<R: AsyncRead> {
     plane_sizes: [PlaneSize; 3],
 }
 
+#[cfg_attr(feature = "gstreamer", allow(unused))]
 impl<R: AsyncRead + Unpin> Decoder<R> {
     /// Create a new decoder instance.
     pub async fn new(reader: R) -> Result<Decoder<R>, Error> {

diff --git a/shin/Cargo.toml b/shin/Cargo.toml
@@ -29,7 +29,7 @@ clap = { version = "4.1.4", features = ["derive"] }
 clap-num = "1.0.2"
 dirs-next = "2.0.0"
 
-winit = "0.28.1"
+winit = { workspace = true }
 wgpu = { workspace = true }
 etagere = "0.2.8"
 
@@ -60,12 +60,10 @@ itertools = { workspace = true }
 once_cell = "1.16.0"
 petitset = "0.2.1"
 
-# egui used for debug overlays
-# git version for wgpu 0.15 support
 egui = { workspace = true }
-egui-wgpu = "0.22.0"
+egui-wgpu = { workspace = true }
 # used for implementation of dynamic atlas overlay
-usvg = "0.35.0"
+usvg = "0.36.0"
 
 # kira for audio output
 kira = { workspace = true }

diff --git a/shin/src/window.rs b/shin/src/window.rs
@@ -67,7 +67,6 @@ impl State {
         let surface = unsafe { instance.create_surface(window) }.context("Creating surface")?;
         let adapter = wgpu::util::initialize_adapter_from_env_or_default(
             &instance,
-            backends,
             // NOTE: this select the low-power GPU by default
             // it's fine, but if we want to use the high-perf one in the future we will have to ditch this function
             Some(&surface),