From 15b8663ba4a61b69283b327149f761e88636fd88 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Thu, 30 Nov 2023 01:56:12 -0500
Subject: [PATCH 1/2] build: unify ash version

---
 .idea/vcs.xml                 | 1 -
 Cargo.lock                    | 8 ++++----
 librashader-capi/Cargo.toml   | 2 +-
 librashader-common/Cargo.toml | 2 +-
 librashader/Cargo.toml        | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 7d502216..c0799a26 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/test/shaders_slang" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 328ec117..7577d525 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2089,9 +2089,9 @@ dependencies = [
 
 [[package]]
 name = "shaderc"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31cef52787a0db5108788ea20bed13d6bf4b96287c5c5201e55725f7070f3443"
+checksum = "27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b"
 dependencies = [
  "libc",
  "shaderc-sys",
@@ -2099,9 +2099,9 @@ dependencies = [
 
 [[package]]
 name = "shaderc-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8f8439fffcffd6efcd74197204addf935dbab5752696bd990a6cd36d54cf64"
+checksum = "73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7"
 dependencies = [
  "cmake",
  "libc",
diff --git a/librashader-capi/Cargo.toml b/librashader-capi/Cargo.toml
index a28b6601..1347bc01 100644
--- a/librashader-capi/Cargo.toml
+++ b/librashader-capi/Cargo.toml
@@ -28,7 +28,7 @@ thiserror = "1.0.37"
 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 }
+ash = { version = "0.37", optional = true }
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 
 [target.'cfg(windows)'.dependencies.windows]
diff --git a/librashader-common/Cargo.toml b/librashader-common/Cargo.toml
index 6f6edfab..3ffdbdc3 100644
--- a/librashader-common/Cargo.toml
+++ b/librashader-common/Cargo.toml
@@ -21,7 +21,7 @@ vulkan = ["ash"]
 
 [dependencies]
 gl = { version = "0.14.0", optional = true }
-ash = { version = "0.37.1+1.3.235", optional = true }
+ash = { version = "0.37", optional = true }
 
 num-traits = "0.2.15"
 
diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml
index a7a5bbe8..b07b789d 100644
--- a/librashader/Cargo.toml
+++ b/librashader/Cargo.toml
@@ -25,7 +25,7 @@ librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.4"
 
 librashader-cache = { path = "../librashader-cache", version = "0.1.4" }
 
-ash = { version = "0.37.1+1.3.235", optional = true }
+ash = { version = "0.37", optional = true }
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.48.0"

From b1531569361efb50ddcbf3d571ceb93a56066bb7 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Thu, 30 Nov 2023 01:58:47 -0500
Subject: [PATCH 2/2] build: prefer static linking of shaderc

---
 librashader-reflect/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml
index 09981b39..7870f521 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]
-shaderc = { version = "0.8.2", features = [] }
+shaderc = { version = "0.8.3", features = [] }
 bytemuck = "1.13.0"
 
 thiserror = "1.0.37"
@@ -37,7 +37,7 @@ optional = true
 [features]
 default = ["cross", "serialize"]
 unstable-naga = [ "naga", "rspirv" ]
-standalone = ["shaderc/build-from-source"]
+standalone = ["shaderc/build-from-source", "shaderc/prefer-static-linking"]
 dxil = ["cross", "spirv-to-dxil"]
 cross = [ "spirv_cross", "spirv_cross/glsl", "spirv_cross/hlsl" ]
 serialize = [ "serde" ]