Merge #166

166: Update to latest SPIRV-Cross r=grovesNL a=grovesNL Fixes #165 Co-authored-by: Joshua Groves <josh@joshgroves.com>
grovesNL · Jan 20, 2021 · fe5a887 · fe5a887
2 parents 2ea85a0 + c20655c
commit fe5a887
Show file tree

Hide file tree

Showing 12 changed files with 337 additions and 32 deletions.
diff --git a/bindings_generator/src/main.rs b/bindings_generator/src/main.rs
@@ -12,8 +12,6 @@ fn main() {
                 .to_str()
                 .unwrap(),
         )
-        .clang_arg("-I/Library/Developer/CommandLineTools/usr/include/c++/v1")
-        .clang_arg("-I/Library/Developer/CommandLineTools/usr/lib/clang/10.0.1/include")
         .clang_args(["-x", "c++", "-std=c++14"].iter())
         .enable_cxx_namespaces()
         .whitelist_function("sc_internal.*")
@@ -45,8 +43,6 @@ fn main() {
                 .to_str()
                 .unwrap(),
         )
-        .clang_arg("-I/Library/Developer/CommandLineTools/usr/include/c++/v1")
-        .clang_arg("-I/Library/Developer/CommandLineTools/usr/lib/clang/10.0.1/include")
         .clang_args(["-x", "c++", "-std=c++14"].iter())
         .enable_cxx_namespaces()
         .whitelist_type("spv::.*")

diff --git a/examples/src/msl/main.rs b/examples/src/msl/main.rs
@@ -22,6 +22,7 @@ fn main() {
             buffer_id: 5,
             texture_id: 6,
             sampler_id: 7,
+            count: 0,
         },
     );
 

diff --git a/spirv_cross/Cargo.toml b/spirv_cross/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv_cross"
-version = "0.22.2"
+version = "0.23.0"
 authors = ["Joshua Groves <josh@joshgroves.com>"]
 description = "Safe wrapper around SPIRV-Cross"
 license = "MIT/Apache-2.0"

diff --git a/spirv_cross/src/bindings_native.rs b/spirv_cross/src/bindings_native.rs
diff --git a/spirv_cross/src/bindings_wasm.rs b/spirv_cross/src/bindings_wasm.rs
diff --git a/spirv_cross/src/compiler.rs b/spirv_cross/src/compiler.rs
@@ -154,6 +154,7 @@ impl spirv::Type {
             B::ControlPointArray => ControlPointArray,
             B::AccelerationStructure => AccelerationStructure,
             B::RayQuery => RayQuery,
+            B::Interpolant => Interpolant,
         }
     }
 }

diff --git a/spirv_cross/src/msl.rs b/spirv_cross/src/msl.rs
@@ -67,6 +67,7 @@ pub struct ResourceBinding {
     pub buffer_id: u32,
     pub texture_id: u32,
     pub sampler_id: u32,
+    pub count: u32,
 }
 
 /// Location of a sampler binding to override
@@ -439,6 +440,7 @@ impl spirv::Compile<Target> for spirv::Ast<Target> {
                     msl_buffer: res.buffer_id,
                     msl_texture: res.texture_id,
                     msl_sampler: res.sampler_id,
+                    count: res.count,
                 }
             }),
         );

diff --git a/spirv_cross/src/spirv.rs b/spirv_cross/src/spirv.rs
@@ -342,6 +342,7 @@ pub struct ShaderResources {
 }
 
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub enum Type {
     // TODO: Add missing fields to relevant variants from SPIRType
     Unknown,
@@ -422,6 +423,7 @@ pub enum Type {
     ControlPointArray,
     AccelerationStructure,
     RayQuery,
+    Interpolant,
 }
 
 /// A SPIR-V shader module.

diff --git a/spirv_cross/src/vendor/SPIRV-Cross b/spirv_cross/src/vendor/SPIRV-Cross
diff --git a/spirv_cross/tests/msl_tests.rs b/spirv_cross/tests/msl_tests.rs
@@ -53,6 +53,7 @@ fn ast_compiles_to_msl() {
             buffer_id: 5,
             texture_id: 6,
             sampler_id: 7,
+            count: 0,
         },
     );
 
@@ -263,6 +264,7 @@ fn sets_argument_buffer_index() {
             buffer_id: 2,
             texture_id: 0,
             sampler_id: 0,
+            count: 0,
         },
     );
     let mut compiler_options = msl::CompilerOptions::default();

diff --git a/wasm/spirv_cross_wrapper_glsl.js b/wasm/spirv_cross_wrapper_glsl.js
diff --git a/wasm/spirv_cross_wrapper_glsl.wasm b/wasm/spirv_cross_wrapper_glsl.wasm