Metal rust shared structs

mopro-msm/Cargo.toml

@@ -40,11 +40,14 @@ rayon = "1.5.1"
 itertools = "0.13.0"
 rand = "0.8.5"
 
+bytemuck = { version = "1.15", features = ["derive"] }
+
 [build-dependencies]
 enumset = "1.0.8"
 toml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
+bindgen = "0.71"
 
 [dev-dependencies]
 serial_test = "3.0.0"

mopro-msm/build.rs

@@ -15,6 +15,8 @@ fn compile_shaders() -> std::io::Result<()> {
     let shader_out_dir = out_dir.join("shaders");
     fs::create_dir_all(&shader_out_dir)?;
 
+    build_cpp_header(manifest_dir.clone());
+
     // Check if we should compile all shaders for testing
     // Check environment variable first, then check if this is a test build
     let compile_all_shaders = env::var("MSM_COMPILE_ALL_SHADERS")
@@ -172,6 +174,38 @@ fn compile_shaders() -> std::io::Result<()> {
     Ok(())
 }
 
+fn build_cpp_header(root_dir: PathBuf) {
+    println!("cargo:rerun-if-changed=src/msm/metal_msm/shader/cuzk/Common.h");
+
+    // macOS SDK root for clang
+    let sdk_root = String::from_utf8(
+        std::process::Command::new("xcrun")
+            .args(["--sdk", "macosx", "--show-sdk-path"])
+            .output()
+            .unwrap()
+            .stdout,
+    )
+    .unwrap()
+    .trim()
+    .to_owned();
+
+    let bindings = bindgen::Builder::default()
+        .header(format!(
+            "{}/src/msm/metal_msm/shader/cuzk/Common.h",
+            root_dir.to_str().unwrap()
+        ))
+        .clang_arg(format!("-isysroot{}", sdk_root))
+        // .clang_arg("-x") // Objective-C dialect so #import works
+        // .clang_arg("objective-c")
+        .allowlist_type("Uniforms|Params")
+        .allowlist_type("BufferIndices|Attributes|TextureIndices")
+        .generate()
+        .expect("bindgen failed");
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    bindings.write_to_file(out_dir.join("common.rs")).unwrap();
+}
+
 fn detect_metal_version(sdk: &str) -> std::io::Result<(String, String, bool)> {
     // Use OS version to determine Metal version support
     let os_version = get_os_version();

mopro-msm/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod msm;
+pub mod types;
 use thiserror::Error;
 
 #[derive(Debug, Error)]

mopro-msm/src/msm/metal_msm/shader/cuzk/Common.h

@@ -0,0 +1,23 @@
+#ifndef Common_h
+#define Common_h
+
+#include <simd/simd.h>
+
+typedef struct {
+  matrix_float4x4 trueMatrix;
+  matrix_float4x4 falseMatrix;
+  matrix_float4x4 otherMatrix;
+} Uniforms;
+
+typedef struct {
+  int width;
+  int height;
+} Params;
+
+typedef enum {
+  VertexBuffer = 0,
+  ParamsBuffer = 2
+} BufferIndices;
+
+
+#endif /* Common_h */