alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

deps: consolidate and update dependencies

Browse source
This commit is contained in:
chyyran 2024-08-11 00:42:50 -04:00 committed by Ronny Chan
parent 40a56bf165
commit c9a6411394
12 changed files with 37 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -1212,9 +1212,9 @@ dependencies = [
[[package]] [[package]]
name = "glslang" name = "glslang"
version = "0.3.2" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6287b8071643d2f88055233b1ecfec954819cd5f91ff4095d5f2e2739a37b3a" checksum = "2619e3eeccf510123b2a38e129dbb4f6c5259a28d58b1e462ff00397176f00dc"
dependencies = [ dependencies = [
"glslang-sys", "glslang-sys",
"once_cell", "once_cell",
@ -1224,9 +1224,9 @@ dependencies = [
[[package]] [[package]]
name = "glslang-sys" name = "glslang-sys"
version = "0.3.3" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b300c41d883992fe736cae5ce49ea588f690d9822ecc876595fa1b8cdf2be70" checksum = "f487792c51b944793232a9928eb9bdb36fe5eff8e868a151b86a8b5168efc724"
dependencies = [ dependencies = [
"cc", "cc",
"glob", "glob",
@ -1765,7 +1765,6 @@ dependencies = [
"librashader-presets", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"num-traits", "num-traits",
"tinymap",
] ]
[[package]] [[package]]
@ -1917,9 +1916,9 @@ dependencies = [
[[package]] [[package]]
name = "librashader-spirv-cross" name = "librashader-spirv-cross"
version = "0.25.2" version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72bb5d2c53ff2b518de2cd127997a5bf1846ffc07980d812b0af44105bcd3b7e" checksum = "4603464191d79d8ce9fe81f7925dfa5b74060b15be51608525f0758f6d88e238"
dependencies = [ dependencies = [
"build-target", "build-target",
"cc", "cc",
@ -3326,21 +3325,6 @@ dependencies = [
"strict-num", "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]] [[package]]
name = "toml" name = "toml"
version = "0.5.11" version = "0.5.11"

8
Cargo.toml
View file

@ -19,6 +19,14 @@ resolver = "2"
[workspace.dependencies] [workspace.dependencies]
windows = "0.58.0" 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] [workspace.metadata.release]

6
librashader-capi/Cargo.toml
View file

@ -38,10 +38,12 @@ thiserror = "1.0.37"
paste = "1.0.9" paste = "1.0.9"
gl = { version = "0.14.0", optional = true } gl = { version = "0.14.0", optional = true }
rustc-hash = "2.0.0" 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" sptr = "0.3.2"
ash = { workspace = true, optional = true }
spirv_cross = { workspace = true }
[dependencies.librashader] [dependencies.librashader]
path = "../librashader" path = "../librashader"
version = "0.3.3" version = "0.3.3"

9
librashader-common/Cargo.toml
View file

@ -23,14 +23,15 @@ wgpu = ["wgpu-types"]
metal = ["objc2-metal"] metal = ["objc2-metal"]
[dependencies] [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" num-traits = "0.2.15"
rustc-hash = "2.0.0" rustc-hash = "2.0.0"
halfbrown = "0.2.4" halfbrown = "0.2.4"
smartstring = "1.0" 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] [target.'cfg(windows)'.dependencies.windows]
optional = true optional = true
workspace = true workspace = true
@ -45,5 +46,5 @@ features = [
[target.'cfg(target_vendor="apple")'.dependencies.objc2-metal] [target.'cfg(target_vendor="apple")'.dependencies.objc2-metal]
optional = true optional = true
version = "0.2.0" workspace = true
features = ["MTLPixelFormat", "MTLRenderCommandEncoder", "MTLSampler"] features = ["MTLPixelFormat", "MTLRenderCommandEncoder", "MTLSampler"]

4
librashader-reflect/Cargo.toml
View file

@ -12,7 +12,7 @@ keywords = ["shader", "retroarch", "SPIR-V"]
description = "RetroArch shaders for all." description = "RetroArch shaders for all."
[dependencies] [dependencies]
glslang = "0.3" glslang = "0.4"
bytemuck = "1.13.0" bytemuck = "1.13.0"
thiserror = "1.0.37" 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-preprocess = { path = "../librashader-preprocess", version = "0.3.3" }
librashader-presets = { path = "../librashader-presets", 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 } naga = { version = "22", optional = true }
rspirv = { version = "0.12.0", optional = true } rspirv = { version = "0.12.0", optional = true }

3
librashader-reflect/src/front/glslang.rs
View file

@ -1,5 +1,5 @@
use crate::error::ShaderCompileError; use crate::error::ShaderCompileError;
use glslang::{CompilerOptions, ShaderInput}; use glslang::{CompilerOptions, ShaderInput, ShaderMessage};
use librashader_preprocess::ShaderSource; use librashader_preprocess::ShaderSource;
use rspirv::binary::Assemble; use rspirv::binary::Assemble;
use rspirv::dr::Builder; use rspirv::dr::Builder;
@ -25,6 +25,7 @@ pub(crate) fn compile_spirv(source: &ShaderSource) -> Result<SpirvCompilation, S
spirv_version: glslang::SpirvVersion::SPIRV1_0, spirv_version: glslang::SpirvVersion::SPIRV1_0,
}, },
version_profile: None, version_profile: None,
messages: ShaderMessage::DEFAULT,
}; };
let vertex = glslang::ShaderSource::from(source.vertex.as_str()); let vertex = glslang::ShaderSource::from(source.vertex.as_str());

2
librashader-runtime-gl/Cargo.toml
View file

@ -18,8 +18,8 @@ librashader-preprocess = { path = "../librashader-preprocess", version = "0.3.3"
librashader-reflect = { path = "../librashader-reflect", version = "0.3.3" } librashader-reflect = { path = "../librashader-reflect", version = "0.3.3" }
librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" } librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" }
librashader-cache = { path = "../librashader-cache", 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" gl = "0.14.0"
bytemuck = { version = "1.12.3", features = ["derive"] } bytemuck = { version = "1.12.3", features = ["derive"] }
thiserror = "1.0.37" thiserror = "1.0.37"

5
librashader-runtime-mtl/Cargo.toml
View file

@ -34,10 +34,9 @@ harness = false
targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "aarch64-apple-ios"] targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "aarch64-apple-ios"]
[target.'cfg(target_vendor="apple")'.dependencies] [target.'cfg(target_vendor="apple")'.dependencies]
objc2-metal = { version = "0.2", features = ["all"] }
objc2-foundation = { version = "0.2", features = ["NSError"] } objc2-foundation = { version = "0.2", features = ["NSError"] }
objc2-metal = { workspace = true, features = ["all"] }
objc2 = { version = "0.5.0", features = ["apple"] } objc2 = { workspace = true, features = ["apple"] }
[features] [features]

3
librashader-runtime-vk/Cargo.toml
View file

@ -23,12 +23,13 @@ librashader-cache = { path = "../librashader-cache", version = "0.3.3" }
bytemuck = { version = "1.12.3", features = ["derive"] } bytemuck = { version = "1.12.3", features = ["derive"] }
thiserror = "1.0.37" thiserror = "1.0.37"
ash = { version = "0.38", features = ["debug"] }
gpu-allocator = { version = "0.27.0", default-features = false, features = ["vulkan"] } gpu-allocator = { version = "0.27.0", default-features = false, features = ["vulkan"] }
parking_lot = "0.12.1" parking_lot = "0.12.1"
rayon = "1.6.1" rayon = "1.6.1"
array-concat = "0.5.2" array-concat = "0.5.2"
ash = { workspace = true, features = ["debug"] }
[dev-dependencies] [dev-dependencies]
num = "0.4.0" num = "0.4.0"
glfw = "0.49.0" glfw = "0.49.0"

2
librashader-runtime-wgpu/Cargo.toml
View file

@ -21,7 +21,7 @@ librashader-reflect = { path = "../librashader-reflect", version = "0.3.3", feat
librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" } librashader-runtime = { path = "../librashader-runtime" , version = "0.3.3" }
librashader-cache = { path = "../librashader-cache", 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" image = "0.25.1"
thiserror = "1.0.50" thiserror = "1.0.50"
bytemuck = { version = "1.14.0", features = ["derive"] } bytemuck = { version = "1.14.0", features = ["derive"] }

2
librashader-runtime/Cargo.toml
View file

@ -21,8 +21,6 @@ num-traits = "0.2.15"
array-concat = "0.5.2" array-concat = "0.5.2"
arc-swap = "1.7.1" arc-swap = "1.7.1"
tinymap = "0.4.0"
[dependencies.image] [dependencies.image]
version = "0.25.1" version = "0.25.1"
features = [ features = [

8
librashader/Cargo.toml
View file

@ -30,16 +30,16 @@ librashader-runtime-wgpu = { path = "../librashader-runtime-wgpu", version = "0.
ash = { version = "0.38", optional = true } ash = { version = "0.38", optional = true }
halfbrown = "0.2.4" halfbrown = "0.2.4"
wgpu = { version = "22", default-features = false, optional = true } wgpu = { workspace = true, default-features = false, optional = true }
wgpu-types = { version = "22", optional = true } wgpu-types = { workspace = true, optional = true }
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
workspace = true workspace = true
optional = true optional = true
[target.'cfg(target_vendor="apple")'.dependencies] [target.'cfg(target_vendor="apple")'.dependencies]
objc2-metal = { version = "0.2.0" , features = [ "all" ], optional = true} objc2-metal = { workspace = true, optional = true}
objc2 = { version = "0.5.0", features = ["apple"] , optional = true } objc2 = { workspace = true, features = ["apple"] , optional = true }
[features] [features]
# core features and definitions # core features and definitions