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

build: switch to custom fork of spirv_cross temporarily

Browse source
This commit is contained in:
chyyran 2023-01-21 02:33:09 -05:00
parent 9cdf646681
commit 341d8825c6
8 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Cargo.lock generated
View file

@ -630,7 +630,7 @@ dependencies = [
"librashader-runtime-d3d11",
"librashader-runtime-gl",
"librashader-runtime-vk",
"spirv_cross",
"librashader-spirv-cross",
"windows",
]
@ -641,6 +641,7 @@ dependencies = [
"ash",
"gl",
"librashader",
"librashader-spirv-cross",
"paste",
"rustc-hash",
"thiserror",
@ -686,10 +687,10 @@ dependencies = [
"librashader-common",
"librashader-preprocess",
"librashader-presets",
"librashader-spirv-cross",
"naga",
"rustc-hash",
"shaderc",
"spirv_cross",
"thiserror",
]
@ -718,8 +719,8 @@ dependencies = [
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"rustc-hash",
"spirv_cross",
"thiserror",
"windows",
]
@ -736,8 +737,8 @@ dependencies = [
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"rustc-hash",
"spirv_cross",
"thiserror",
]
@ -754,14 +755,25 @@ dependencies = [
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"num",
"raw-window-handle 0.5.0",
"rustc-hash",
"spirv_cross",
"thiserror",
"winit",
]
[[package]]
name = "librashader-spirv-cross"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7fccac471e14b681ffaabd42d09fbd9f9cf87a896acdc0d321a977c6821012"
dependencies = [
"cc",
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "lock_api"
version = "0.4.9"
@ -1366,17 +1378,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "spirv_cross"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60647fadbf83c4a72f0d7ea67a7ca3a81835cf442b8deae5c134c3e0055b2e14"
dependencies = [
"cc",
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "strsim"
version = "0.10.0"

1
librashader-capi/Cargo.toml
View file

@ -27,6 +27,7 @@ paste = "1.0.9"
gl = { version = "0.14.0", optional = true }
rustc-hash = "1.1.0"
ash = { version = "0.37.2+1.3.238", optional = true }
spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
[target.'cfg(windows)'.dependencies.windows]
version = "0.44.0"

2
librashader-reflect/Cargo.toml
View file

@ -13,7 +13,7 @@ description = "RetroArch shaders for all."
[dependencies]
shaderc = { version = "0.8.2", features = [] }
spirv_cross = { version = "0.23.1", features = [ "glsl", "hlsl" ] }
spirv_cross = { package = "librashader-spirv-cross", version = "0.23", features = [ "glsl", "hlsl" ] }
thiserror = "1.0.37"
bitflags = "1.3.2"

6
librashader-reflect/src/reflect/cross.rs
View file

@ -52,7 +52,9 @@ pub(crate) type GlslReflect = CrossReflect<glsl::Target>;
impl ValidateTypeSemantics<Type> for UniqueSemantics {
fn validate_type(&self, ty: &Type) -> Option<TypeInfo> {
let (Type::Float { ref array, vecsize, columns } | Type::Int { ref array, vecsize, columns } | Type::UInt { ref array, vecsize, columns }) = *ty else {
let (Type::Float { ref array, vecsize, columns, .. }
| Type::Int { ref array, vecsize, columns, .. }
| Type::UInt { ref array, vecsize, columns, .. }) = *ty else {
return None
};
@ -89,7 +91,7 @@ impl ValidateTypeSemantics<Type> for UniqueSemantics {
impl ValidateTypeSemantics<Type> for TextureSemantics {
fn validate_type(&self, ty: &Type) -> Option<TypeInfo> {
let Type::Float { ref array, vecsize, columns } = *ty else {
let Type::Float { ref array, vecsize, columns, .. } = *ty else {
return None
};

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

@ -18,7 +18,7 @@ librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-
librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.7", features = ["standalone"] }
librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-beta.7" }
thiserror = "1.0.37"
spirv_cross = "0.23.1"
spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
rustc-hash = "1.1.0"
bytemuck = "1.12.3"

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

@ -17,7 +17,7 @@ librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.7
librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.7" }
librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.7", features = ["standalone"] }
librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.7" }
spirv_cross = "0.23.1"
spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
rustc-hash = "1.1.0"
gl = "0.14.0"
bytemuck = "1.12.3"

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

@ -19,7 +19,7 @@ librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.7
librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.7" }
librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.7", features = [] }
librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.7" }
spirv_cross = "0.23.1"
spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
rustc-hash = "1.1.0"
bytemuck = "1.12.3"
thiserror = "1.0.37"

2
librashader/Cargo.toml
View file

@ -23,7 +23,7 @@ librashader-runtime-gl = { path = "../librashader-runtime-gl", version = "0.1.0-
librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.0-beta.7", optional = true }
ash = { version = "0.37.1+1.3.235", optional = true }
spirv_cross = { version = "0.23.1", optional = true, features = ["glsl"] }
spirv_cross = { package = "librashader-spirv-cross", version = "0.23", features = ["glsl"], optional = true }
[target.'cfg(windows)'.dependencies.windows]
version = "0.44.0"