From c9a64113942e29117467e16ff8b32d1691dd4718 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Sun, 11 Aug 2024 00:42:50 -0400
Subject: [PATCH] deps: consolidate and update dependencies

---
 Cargo.lock                               | 28 +++++-------------------
 Cargo.toml                               |  8 +++++++
 librashader-capi/Cargo.toml              |  6 +++--
 librashader-common/Cargo.toml            |  9 ++++----
 librashader-reflect/Cargo.toml           |  4 ++--
 librashader-reflect/src/front/glslang.rs |  3 ++-
 librashader-runtime-gl/Cargo.toml        |  2 +-
 librashader-runtime-mtl/Cargo.toml       |  5 ++---
 librashader-runtime-vk/Cargo.toml        |  3 ++-
 librashader-runtime-wgpu/Cargo.toml      |  2 +-
 librashader-runtime/Cargo.toml           |  2 --
 librashader/Cargo.toml                   |  8 +++----
 12 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b972b47..355152f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1212,9 +1212,9 @@ dependencies = [
 
 [[package]]
 name = "glslang"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6287b8071643d2f88055233b1ecfec954819cd5f91ff4095d5f2e2739a37b3a"
+checksum = "2619e3eeccf510123b2a38e129dbb4f6c5259a28d58b1e462ff00397176f00dc"
 dependencies = [
  "glslang-sys",
  "once_cell",
@@ -1224,9 +1224,9 @@ dependencies = [
 
 [[package]]
 name = "glslang-sys"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b300c41d883992fe736cae5ce49ea588f690d9822ecc876595fa1b8cdf2be70"
+checksum = "f487792c51b944793232a9928eb9bdb36fe5eff8e868a151b86a8b5168efc724"
 dependencies = [
  "cc",
  "glob",
@@ -1765,7 +1765,6 @@ dependencies = [
  "librashader-presets",
  "librashader-reflect",
  "num-traits",
- "tinymap",
 ]
 
 [[package]]
@@ -1917,9 +1916,9 @@ dependencies = [
 
 [[package]]
 name = "librashader-spirv-cross"
-version = "0.25.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72bb5d2c53ff2b518de2cd127997a5bf1846ffc07980d812b0af44105bcd3b7e"
+checksum = "4603464191d79d8ce9fe81f7925dfa5b74060b15be51608525f0758f6d88e238"
 dependencies = [
  "build-target",
  "cc",
@@ -3326,21 +3325,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tinymap"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606a25fa775ecddf21f83f373a0724423f364b5aaacac14f0cce4cf4c976ff43"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-
 [[package]]
 name = "toml"
 version = "0.5.11"
diff --git a/Cargo.toml b/Cargo.toml
index b0a150d..20b0cb3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,14 @@ resolver = "2"
 
 [workspace.dependencies]
 windows = "0.58.0"
+ash = "0.38"
+spirv_cross = { package = "librashader-spirv-cross", version = "0.26" }
+
+objc2-metal = { version = "0.2" }
+objc2 = { version = "0.5.0" }
+
+wgpu = { version = "22", default-features = false }
+wgpu-types = { version = "22" }
 
 [workspace.metadata.release]
 
diff --git a/librashader-capi/Cargo.toml b/librashader-capi/Cargo.toml
index a276401..98f761d 100644
--- a/librashader-capi/Cargo.toml
+++ b/librashader-capi/Cargo.toml
@@ -38,10 +38,12 @@ thiserror = "1.0.37"
 paste = "1.0.9"
 gl = { version = "0.14.0", optional = true }
 rustc-hash = "2.0.0"
-ash = { version = "0.38", optional = true }
-spirv_cross = { package = "librashader-spirv-cross", version = "0.25.1" }
+
 sptr = "0.3.2"
 
+ash = { workspace = true, optional = true }
+spirv_cross = { workspace = true }
+
 [dependencies.librashader]
 path = "../librashader"
 version = "0.3.3"
diff --git a/librashader-common/Cargo.toml b/librashader-common/Cargo.toml
index c1da3ae..4dc1a71 100644
--- a/librashader-common/Cargo.toml
+++ b/librashader-common/Cargo.toml
@@ -23,14 +23,15 @@ wgpu = ["wgpu-types"]
 metal = ["objc2-metal"]
 
 [dependencies]
-gl = { version = "0.14.0", optional = true }
-ash = { version = "0.38", optional = true }
-wgpu-types = { version = "22", optional = true }
 num-traits = "0.2.15"
 rustc-hash = "2.0.0"
 halfbrown = "0.2.4"
 smartstring = "1.0"
 
+gl = { version = "0.14", optional = true }
+ash = { workspace = true, optional = true }
+wgpu-types = { workspace = true, optional = true }
+
 [target.'cfg(windows)'.dependencies.windows]
 optional = true
 workspace = true
@@ -45,5 +46,5 @@ features = [
 
 [target.'cfg(target_vendor="apple")'.dependencies.objc2-metal]
 optional = true
-version = "0.2.0"
+workspace = true
 features = ["MTLPixelFormat", "MTLRenderCommandEncoder", "MTLSampler"]
diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml
index 5fa707f..327fe5f 100644
--- a/librashader-reflect/Cargo.toml
+++ b/librashader-reflect/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-glslang = "0.3"
+glslang = "0.4"
 bytemuck = "1.13.0"
 
 thiserror = "1.0.37"
@@ -22,7 +22,7 @@ librashader-common = { path = "../librashader-common", version = "0.3.3" }
 librashader-preprocess = { path = "../librashader-preprocess", version = "0.3.3" }
 librashader-presets = { path = "../librashader-presets", version = "0.3.3" }
 
-spirv_cross = { package = "librashader-spirv-cross", version = "0.25.1", optional = true }
+spirv_cross = { workspace = true, optional = true }
 
 naga = { version = "22", optional = true }
 rspirv = { version = "0.12.0", optional = true }
diff --git a/librashader-reflect/src/front/glslang.rs b/librashader-reflect/src/front/glslang.rs
index 88b1170..93c3568 100644
--- a/librashader-reflect/src/front/glslang.rs
+++ b/librashader-reflect/src/front/glslang.rs
@@ -1,5 +1,5 @@
 use crate::error::ShaderCompileError;
-use glslang::{CompilerOptions, ShaderInput};
+use glslang::{CompilerOptions, ShaderInput, ShaderMessage};
 use librashader_preprocess::ShaderSource;
 use rspirv::binary::Assemble;
 use rspirv::dr::Builder;
@@ -25,6 +25,7 @@ pub(crate) fn compile_spirv(source: &ShaderSource) -> Result<SpirvCompilation, S
             spirv_version: glslang::SpirvVersion::SPIRV1_0,
         },
         version_profile: None,
+        messages: ShaderMessage::DEFAULT,
     };
 
     let vertex = glslang::ShaderSource::from(source.vertex.as_str());
diff --git a/librashader-runtime-gl/Cargo.toml b/librashader-runtime-gl/Cargo.toml
index 075266b..4442977 100644
--- a/librashader-runtime-gl/Cargo.toml
+++ b/librashader-runtime-gl/Cargo.toml
@@ -18,8 +18,8 @@ librashader-preprocess = { path = "../librashader-preprocess", version = "0.3.3"
 librashader-reflect = { path = "../librashader-reflect", version = "0.3.3" }
 librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" }
 librashader-cache = { path = "../librashader-cache", version = "0.3.3" }
-spirv_cross = { package = "librashader-spirv-cross", version = "0.25.1" }
 
+spirv_cross = { workspace = true }
 gl = "0.14.0"
 bytemuck = { version = "1.12.3", features = ["derive"] }
 thiserror = "1.0.37"
diff --git a/librashader-runtime-mtl/Cargo.toml b/librashader-runtime-mtl/Cargo.toml
index f94c075..c933fe5 100644
--- a/librashader-runtime-mtl/Cargo.toml
+++ b/librashader-runtime-mtl/Cargo.toml
@@ -34,10 +34,9 @@ harness = false
 targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "aarch64-apple-ios"]
 
 [target.'cfg(target_vendor="apple")'.dependencies]
-objc2-metal = { version = "0.2", features = ["all"] }
 objc2-foundation = { version = "0.2", features = ["NSError"] }
-
-objc2 = { version = "0.5.0", features = ["apple"] }
+objc2-metal = { workspace = true, features = ["all"] }
+objc2 = { workspace = true, features = ["apple"] }
 
 [features]
 
diff --git a/librashader-runtime-vk/Cargo.toml b/librashader-runtime-vk/Cargo.toml
index 35a1a03..642c851 100644
--- a/librashader-runtime-vk/Cargo.toml
+++ b/librashader-runtime-vk/Cargo.toml
@@ -23,12 +23,13 @@ librashader-cache = { path = "../librashader-cache", version = "0.3.3" }
 
 bytemuck = { version = "1.12.3", features = ["derive"] }
 thiserror = "1.0.37"
-ash = { version = "0.38", features = ["debug"] }
 gpu-allocator = { version = "0.27.0", default-features = false, features = ["vulkan"] }
 parking_lot = "0.12.1"
 rayon = "1.6.1"
 array-concat = "0.5.2"
 
+ash = { workspace = true, features = ["debug"] }
+
 [dev-dependencies]
 num = "0.4.0"
 glfw = "0.49.0"
diff --git a/librashader-runtime-wgpu/Cargo.toml b/librashader-runtime-wgpu/Cargo.toml
index 1fbdc3a..06b0728 100644
--- a/librashader-runtime-wgpu/Cargo.toml
+++ b/librashader-runtime-wgpu/Cargo.toml
@@ -21,7 +21,7 @@ librashader-reflect = { path = "../librashader-reflect", version = "0.3.3", feat
 librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" }
 librashader-cache = { path = "../librashader-cache", version = "0.3.3" }
 
-wgpu = { version = "22.0", default-features = false, features = ["wgsl"] }
+wgpu = { workspace = true, default-features = false, features = ["wgsl"] }
 image = "0.25.1"
 thiserror = "1.0.50"
 bytemuck = { version = "1.14.0", features = ["derive"] }
diff --git a/librashader-runtime/Cargo.toml b/librashader-runtime/Cargo.toml
index b4e4d73..91bf899 100644
--- a/librashader-runtime/Cargo.toml
+++ b/librashader-runtime/Cargo.toml
@@ -21,8 +21,6 @@ num-traits = "0.2.15"
 array-concat = "0.5.2"
 arc-swap = "1.7.1"
 
-tinymap = "0.4.0"
-
 [dependencies.image]
 version = "0.25.1"
 features = [
diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml
index 9716096..7fe2493 100644
--- a/librashader/Cargo.toml
+++ b/librashader/Cargo.toml
@@ -30,16 +30,16 @@ librashader-runtime-wgpu = { path = "../librashader-runtime-wgpu", version = "0.
 ash = { version = "0.38", optional = true }
 halfbrown = "0.2.4"
 
-wgpu = { version = "22", default-features = false, optional = true }
-wgpu-types = { version = "22", optional = true }
+wgpu = { workspace = true, default-features = false, optional = true }
+wgpu-types = {  workspace = true, optional = true }
 
 [target.'cfg(windows)'.dependencies.windows]
 workspace = true
 optional = true
 
 [target.'cfg(target_vendor="apple")'.dependencies]
-objc2-metal = { version = "0.2.0" , features = [ "all" ], optional = true}
-objc2 = { version = "0.5.0", features = ["apple"] , optional = true }
+objc2-metal = { workspace = true, optional = true}
+objc2 = { workspace = true, features = ["apple"] , optional = true }
 
 [features]
 # core features and definitions