From 89090757fd1bc98a8778d5522cbcbb30b9ea5d1f Mon Sep 17 00:00:00 2001
From: Alex Janka <alex@alexjanka.com>
Date: Sat, 20 Jul 2024 17:29:27 +1000
Subject: [PATCH] fix shaderstorage in tests

---
 librashader-preprocess/src/lib.rs            | 6 +++---
 librashader-reflect/src/reflect/cross/mod.rs | 5 ++++-
 librashader-reflect/src/reflect/cross/msl.rs | 5 ++++-
 librashader-reflect/src/reflect/naga/msl.rs  | 5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/librashader-preprocess/src/lib.rs b/librashader-preprocess/src/lib.rs
index 9e18ae1..8035212 100644
--- a/librashader-preprocess/src/lib.rs
+++ b/librashader-preprocess/src/lib.rs
@@ -105,9 +105,9 @@ mod test {
 
     #[test]
     pub fn load_file() {
-        let result = load_shader_source(
-            "../test/slang-shaders/blurs/shaders/royale/blur3x3-last-pass.slang",
-        )
+        let result = load_shader_source(&librashader_common::ShaderStorage::Path(
+            "../test/slang-shaders/blurs/shaders/royale/blur3x3-last-pass.slang".into(),
+        ))
         .unwrap();
         eprintln!("{:#}", result.vertex)
     }
diff --git a/librashader-reflect/src/reflect/cross/mod.rs b/librashader-reflect/src/reflect/cross/mod.rs
index 688d198..6290b03 100644
--- a/librashader-reflect/src/reflect/cross/mod.rs
+++ b/librashader-reflect/src/reflect/cross/mod.rs
@@ -761,7 +761,10 @@ mod test {
 
     #[test]
     pub fn test_into() {
-        let result = ShaderSource::load("../test/basic.slang").unwrap();
+        let result = ShaderSource::load(&librashader_common::ShaderStorage::Path(
+            "../test/basic.slang".into(),
+        ))
+        .unwrap();
         let mut uniform_semantics: FastHashMap<String, UniformSemantic> = Default::default();
 
         for (_index, param) in result.parameters.iter().enumerate() {
diff --git a/librashader-reflect/src/reflect/cross/msl.rs b/librashader-reflect/src/reflect/cross/msl.rs
index 60b52de..99b8892 100644
--- a/librashader-reflect/src/reflect/cross/msl.rs
+++ b/librashader-reflect/src/reflect/cross/msl.rs
@@ -120,7 +120,10 @@ mod test {
     pub fn test_into() {
         // let result = ShaderSource::load("../test/shaders_slang/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang").unwrap();
         // let result = ShaderSource::load("../test/shaders_slang/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang").unwrap();
-        let result = ShaderSource::load("../test/basic.slang").unwrap();
+        let result = ShaderSource::load(&librashader_common::ShaderStorage::Path(
+            "../test/basic.slang".into(),
+        ))
+        .unwrap();
 
         let mut uniform_semantics: FastHashMap<String, UniformSemantic> = Default::default();
 
diff --git a/librashader-reflect/src/reflect/naga/msl.rs b/librashader-reflect/src/reflect/naga/msl.rs
index 1f705c8..74300c4 100644
--- a/librashader-reflect/src/reflect/naga/msl.rs
+++ b/librashader-reflect/src/reflect/naga/msl.rs
@@ -172,7 +172,10 @@ mod test {
 
     #[test]
     pub fn test_into() {
-        let result = ShaderSource::load("../test/basic.slang").unwrap();
+        let result = ShaderSource::load(&librashader_common::ShaderStorage::Path(
+            "../test/basic.slang".into(),
+        ))
+        .unwrap();
 
         let mut uniform_semantics: FastHashMap<String, UniformSemantic> = Default::default();