From 742a1c86580a682280a719a817bed0d6f4a4028b Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Tue, 1 Oct 2024 23:59:29 -0400
Subject: [PATCH] dep: update glslang

---
 Cargo.lock                               |  6 +++---
 librashader-reflect/Cargo.toml           |  2 +-
 librashader-reflect/src/front/glslang.rs | 10 ++++++++--
 librashader-runtime/src/image.rs         |  7 +++----
 4 files changed, 15 insertions(+), 10 deletions(-)

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<SpirvCompilation, S
     };
 
     let vertex = glslang::ShaderSource::from(source.vertex.as_str());
-    let vertex = ShaderInput::new(&vertex, glslang::ShaderStage::Vertex, &options, None)?;
+    let vertex = ShaderInput::new(&vertex, glslang::ShaderStage::Vertex, &options, None, None)?;
     let vertex = compiler.create_shader(vertex)?;
 
     let fragment = glslang::ShaderSource::from(source.fragment.as_str());
-    let fragment = ShaderInput::new(&fragment, glslang::ShaderStage::Fragment, &options, None)?;
+    let fragment = ShaderInput::new(
+        &fragment,
+        glslang::ShaderStage::Fragment,
+        &options,
+        None,
+        None,
+    )?;
     let fragment = compiler.create_shader(fragment)?;
 
     let vertex = vertex.compile()?;
diff --git a/librashader-runtime/src/image.rs b/librashader-runtime/src/image.rs
index 996ea64..81464d6 100644
--- a/librashader-runtime/src/image.rs
+++ b/librashader-runtime/src/image.rs
@@ -5,8 +5,8 @@ use std::marker::PhantomData;
 use image::error::{LimitError, LimitErrorKind};
 use image::DynamicImage;
 use librashader_pack::{TextureBuffer, TextureData};
-use std::path::Path;
 use librashader_presets::TextureMeta;
+use std::path::Path;
 
 /// An uncompressed raw image ready to upload to GPU buffers.
 pub struct Image<P: PixelFormat = RGBA8> {
@@ -122,10 +122,10 @@ pub struct LoadedTexture<P: PixelFormat = RGBA8> {
     /// The loaded image data
     pub image: Image<P>,
     /// Meta information about the texture
-    pub meta: TextureMeta
+    pub meta: TextureMeta,
 }
 
-impl <P: PixelFormat> LoadedTexture<P> {
+impl<P: PixelFormat> LoadedTexture<P> {
     /// Load the texture with the given UV direction and subpixel ordering.
     pub fn from_texture(texture: TextureData, direction: UVDirection) -> Result<Self, ImageError> {
         Ok(LoadedTexture {
@@ -135,7 +135,6 @@ impl <P: PixelFormat> LoadedTexture<P> {
     }
 }
 
-
 // load-bearing #[inline(always)], without it llvm will not vectorize.
 #[inline(always)]
 fn swizzle_pixels(pixels: &mut Vec<u8>, swizzle: &'static [usize; 32]) {