Add wasm32-unknown-unknown support

Cargo.toml

@@ -2,5 +2,6 @@
 members = [
     "spirv_cross",
     "examples",
-    "bindings_generator"
+    "bindings_generator",
+    "wasm"
 ]

bindings_generator/Cargo.toml

@@ -8,4 +8,4 @@ bindgen = "0.30.0"
 
 [[bin]]
 name = "bindings_generator"
-path = "src/main.rs"
+path = "src/main.rs"

bindings_generator/src/main.rs

@@ -1,10 +1,10 @@
 extern crate bindgen;
 
 use std::env;
-use std::path::PathBuf;
 
 fn main() {
-    let out_path = PathBuf::from(env::current_dir().unwrap());
+    let out_path = env::current_dir().unwrap();
+    // For native targets, include all types and functions
     bindgen::Builder::default()
         .header(
             out_path
@@ -20,10 +20,65 @@ fn main() {
         .whitelisted_type("spirv_cross::Resource")
         .whitelisted_type("spirv_cross::MSLVertexAttr")
         .whitelisted_type("spirv_cross::MSLResourceBinding")
+        // TODO: Simplify with glob
+        .whitelisted_type("ScInternalCompilerBase")
+        .whitelisted_type("ScInternalCompilerHlsl")
+        .whitelisted_type("ScInternalCompilerMsl")
+        .whitelisted_type("ScInternalCompilerGlsl")
+        .whitelisted_type("ScInternalResult")
+        .whitelisted_type("ScEntryPoint")
+        .whitelisted_type("ScCombinedImageSampler")
+        .whitelisted_type("ScHlslRootConstant")
+        .whitelisted_type("ScHlslCompilerOptions")
+        .whitelisted_type("ScMslCompilerOptions")
+        .whitelisted_type("ScGlslCompilerOptions")
+        .whitelisted_type("ScResource")
+        .whitelisted_type("ScResourceArray")
+        .whitelisted_type("ScShaderResources")
+        .whitelisted_type("ScSpecializationConstant")
+        .whitelisted_type("ScType")
         .opaque_type("std::.*")
         .layout_tests(false)
         .generate()
         .expect("Unable to generate bindings")
-        .write_to_file(out_path.join("../spirv_cross/src/bindings.rs"))
+        .write_to_file(out_path.join("../spirv_cross/src/bindings_native.rs"))
+        .expect("Couldn't write bindings!");
+    // For wasm targets, include all types, functions will be implemented manually
+    bindgen::Builder::default()
+        .header(
+            out_path
+                .join("../spirv_cross/src/wrapper.hpp")
+                .to_str()
+                .unwrap(),
+        )
+        .clang_args(["-x", "c++", "-std=c++14"].iter())
+        .enable_cxx_namespaces()
+        .whitelisted_type("spv::.*")
+        .bitfield_enum(".*(Mask|Flags)")
+        .whitelisted_type("spirv_cross::Resource")
+        .whitelisted_type("spirv_cross::MSLVertexAttr")
+        .whitelisted_type("spirv_cross::MSLResourceBinding")
+        // TODO: Simplify with glob
+        .whitelisted_type("ScInternalCompilerBase")
+        .whitelisted_type("ScInternalCompilerHlsl")
+        .whitelisted_type("ScInternalCompilerMsl")
+        .whitelisted_type("ScInternalCompilerGlsl")
+        .whitelisted_type("ScInternalResult")
+        .whitelisted_type("ScEntryPoint")
+        .whitelisted_type("ScCombinedImageSampler")
+        .whitelisted_type("ScHlslRootConstant")
+        .whitelisted_type("ScHlslCompilerOptions")
+        .whitelisted_type("ScMslCompilerOptions")
+        .whitelisted_type("ScGlslCompilerOptions")
+        .whitelisted_type("ScResource")
+        .whitelisted_type("ScResourceArray")
+        .whitelisted_type("ScShaderResources")
+        .whitelisted_type("ScSpecializationConstant")
+        .whitelisted_type("ScType")
+        .opaque_type("std::.*")
+        .layout_tests(false)
+        .generate()
+        .expect("Unable to generate bindings")
+        .write_to_file(out_path.join("../spirv_cross/src/bindings_wasm.rs"))
         .expect("Couldn't write bindings!");
 }

examples/Cargo.toml

@@ -2,6 +2,7 @@
 name = "examples"
 version = "0.1.0"
 authors = ["Joshua Groves <[email protected]>"]
+edition = "2018"
 
 [dependencies]
 spirv_cross = { path = "../spirv_cross" }

examples/src/lib.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::cast_ptr_alignment)]
 pub fn words_from_bytes(buf: &[u8]) -> &[u32] {
     unsafe {
         std::slice::from_raw_parts(

spirv_cross/Cargo.toml

@@ -9,6 +9,20 @@ repository = "https://github.com/grovesNL/spirv_cross"
 readme = "../README.md"
 keywords = ["spirv", "cross"]
 build = "build.rs"
+edition = "2018"
 
-[build-dependencies]
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["glsl", "hlsl", "msl"]
+glsl = []
+hlsl = []
+msl = []
+
+[target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
 cc = "1.0.4"
+
+[target.wasm32-unknown-unknown.dependencies]
+wasm-bindgen = "0.2.33"
+js-sys = "0.3.10"

spirv_cross/build.rs

@@ -1,6 +1,12 @@
-extern crate cc;
-
 fn main() {
+    // Prevent building SPIRV-Cross on wasm32 target
+    let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH");
+    if let Ok(arch) = target_arch {
+        if "wasm32" == arch {
+            return; 
+        }
+    }
+
     let target_os = std::env::var("CARGO_CFG_TARGET_OS");
     let is_macos = target_os.is_ok() && target_os.unwrap() == "macos";
 
@@ -22,9 +28,16 @@ fn main() {
         .file("src/vendor/SPIRV-Cross/spirv_cross.cpp")
         .file("src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp")
         .file("src/vendor/SPIRV-Cross/spirv_parser.cpp")
-        .file("src/vendor/SPIRV-Cross/spirv_cross_util.cpp")
-        .file("src/vendor/SPIRV-Cross/spirv_glsl.cpp")
-        .file("src/vendor/SPIRV-Cross/spirv_hlsl.cpp")
-        .file("src/vendor/SPIRV-Cross/spirv_msl.cpp")
-        .compile("spirv-cross-rust-wrapper");
+        .file("src/vendor/SPIRV-Cross/spirv_cross_util.cpp");
+
+    #[cfg(feature = "glsl")]
+    build.file("src/vendor/SPIRV-Cross/spirv_glsl.cpp");
+
+    #[cfg(feature = "hlsl")]
+    build.file("src/vendor/SPIRV-Cross/spirv_hlsl.cpp");
+
+    #[cfg(feature = "msl")]
+    build.file("src/vendor/SPIRV-Cross/spirv_msl.cpp");
+
+    build.compile("spirv-cross-rust-wrapper");
 }

spirv_cross/src/bindings.rs → spirv_cross/src/bindings_native.rs

@@ -1843,7 +1843,10 @@ pub mod root {
         pub fn sc_internal_compiler_set_scalar_constant(compiler:
                                                             *const root::ScInternalCompilerBase,
                                                         id: u32,
-                                                        constant: u64)
+                                                        constant_high_bits:
+                                                            u32,
+                                                        constant_low_bits:
+                                                            u32)
          -> root::ScInternalResult;
     }
     extern "C" {