diff --git a/Cargo.lock b/Cargo.lock index 0f627ea..6ee0f78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1151,14 +1151,14 @@ dependencies = [ [[package]] name = "glslang" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e058f69c0b36dc2ce7e5243f440d186ae65ab7aa9e76cd4c5b953ea4b43286d" +checksum = "ca195de172c94a69ab142424542f421cf8f7f14555ebbd82c6e8089a8cb318f7" dependencies = [ "bitflags 2.6.0", "glslang-sys", - "once_cell", "rustc-hash 2.0.0", + "smartstring", "thiserror", ] diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml index 7cec6e5..80e5e1b 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.5" +glslang = "0.6.0" bytemuck = "1.13.0" thiserror = "1.0.37" diff --git a/librashader-reflect/src/front/glslang.rs b/librashader-reflect/src/front/glslang.rs index 93c3568..ace7683 100644 --- a/librashader-reflect/src/front/glslang.rs +++ b/librashader-reflect/src/front/glslang.rs @@ -29,11 +29,17 @@ pub(crate) fn compile_spirv(source: &ShaderSource) -> Result { @@ -122,10 +122,10 @@ pub struct LoadedTexture { /// The loaded image data pub image: Image

, /// Meta information about the texture - pub meta: TextureMeta + pub meta: TextureMeta, } -impl LoadedTexture

{ +impl LoadedTexture

{ /// Load the texture with the given UV direction and subpixel ordering. pub fn from_texture(texture: TextureData, direction: UVDirection) -> Result { Ok(LoadedTexture { @@ -135,7 +135,6 @@ impl LoadedTexture

{ } } - // load-bearing #[inline(always)], without it llvm will not vectorize. #[inline(always)] fn swizzle_pixels(pixels: &mut Vec, swizzle: &'static [usize; 32]) {