Decouple glam from spirv-std (#476)

Author: XAMPPRocky

Cargo.lock

@@ -18,3 +18,7 @@ members = [
 [profile.release.build-override]
 opt-level = 3
 codegen-units = 16
+
+[patch.crates-io]
+spirv-std = { path = "./crates/spirv-std" }
+glam = { git = "https://github.com/EmbarkStudios/glam-rs.git", branch ="spirv-std-impl" }

Cargo.toml

@@ -463,6 +463,9 @@ pub fn main() {
     let vector = glam::Vec2::new(1.0, 2.0);
     let element = unsafe { spirv_std::arch::vector_extract_dynamic(vector, 1) };
     assert!(2.0 == element);
+    let uvector = glam::UVec2::new(1, 2);
+    let element: u32 = unsafe { spirv_std::arch::vector_extract_dynamic(uvector, 1) };
+    assert!(2 == element);
 }
 "#);
 }
@@ -476,6 +479,10 @@ pub fn main() {
     let expected = glam::Vec2::new(1.0, 3.0);
     let new_vector = unsafe { spirv_std::arch::vector_insert_dynamic(vector, 1, 3.0) };
     assert!(new_vector == expected);
+    let uvector = glam::UVec2::new(1, 2);
+    let uexpected = glam::UVec2::new(1, 3);
+    let new_vector = unsafe { spirv_std::arch::vector_insert_dynamic(uvector, 1, 3) };
+    assert!(new_vector == uexpected);
 }
 "#);
 }
@@ -545,7 +552,7 @@ fn complex_image_sample_inst() {
     }
     #[spirv(fragment)]
     pub fn main() {
-        sample_proj_lod(glam::Vec4::zero(), glam::Vec2::zero(), glam::Vec2::zero(), 0, 0);
+        sample_proj_lod(glam::Vec4::ZERO, glam::Vec2::ZERO, glam::Vec2::ZERO, 0, 0);
     }"#,
         "sample_proj_lod",
         "%1 = OpFunction %2 None %3
@@ -568,7 +575,7 @@ fn image_read() {
     val(r#"
 #[spirv(fragment)]
 pub fn main(image: UniformConstant<StorageImage2d>, mut output: Output<glam::Vec2>) {
-    let coords = image.read(glam::IVec2::new(0, 1));
+    let coords =  image.read(glam::IVec2::new(0, 1));
     *output = coords;
 }
 "#);

crates/spirv-builder/src/test/basic.rs

@@ -330,7 +330,7 @@ fn issue_283() {
     // version of issue 283 with loop uncommented and warnings fixed
     // https://github.com/EmbarkStudios/rust-gpu/issues/283
     val(r#"
-use spirv_std::glam::*;
+use glam::*;
 fn sphere_sdf(p: Vec3) -> f32 {
     p.length() - 1.0
 }

crates/spirv-builder/src/test/control_flow.rs

@@ -47,7 +47,11 @@ overflow-checks = false
 debug-assertions = false
 
 [dependencies]
-spirv-std = { path = "../../crates/spirv-std" }
+spirv-std = { path = "../../crates/spirv-std", features=["const-generics"] }
+glam = { git = "https://github.com/EmbarkStudios/glam-rs.git", branch="spirv-std-impl", default-features=false, features = ["libm", "scalar-math"] }
+
+[patch.crates-io.spirv-std]
+path="../../crates/spirv-std"
 
 [workspace]
 "#;

crates/spirv-builder/src/test/mod.rs

@@ -11,5 +11,6 @@ description = "Macros for spirv-std"
 proc-macro = true
 
 [dependencies]
+proc-macro2 = "1.0.24"
 quote = "1.0.8"
 syn = { version = "1.0.58", features=["full"] }