Macos rework

.cargo/config.toml

@@ -0,0 +1,5 @@
+[build]
+rustflags = ["-A", "unused"]
+
+[env]
+MACOSX_DEPLOYMENT_TARGET = "15.0"

.claude/settings.local.json

@@ -3,7 +3,19 @@
     "allow": [
       "Bash(dir:*)",
       "Bash(grep:*)",
-      "Bash(cargo build:*)"
+      "Bash(cargo build:*)",
+      "Bash(ls:*)",
+      "Bash(python3:*)",
+      "Bash(cargo check:*)",
+      "Bash(cargo tree:*)",
+      "Bash(xargs:*)",
+      "Bash(cargo doc:*)",
+      "Bash(curl -s \"https://crates.io/api/v1/crates/winit\")",
+      "Bash(cargo add *)",
+      "Bash(sed -i '' 's/winit = \"0.29.1\"/winit = \"0.30\"/' Cargo.toml)",
+      "Bash(cargo fetch *)",
+      "Bash(ls ~/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/ | grep winit)",
+      "Read(//Users/alex.dixon/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/**)"
     ]
   }
 }

.vscode/launch.json

@@ -88,6 +88,50 @@
             "console": "externalTerminal",
             "preLaunchTask": "examples"
         },
+        {
+            "name": "bindful (macOS|Debug)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/examples/bindful",
+            "args": [],
+            "stopAtEntry": false,
+            // "cwd": "${fileDirname}",
+            "environment": [],
+            "console": "externalTerminal",
+            // "preLaunchTask": "examples"
+        },
+        {
+            "name": "bindless (macOS|Debug)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/examples/bindless",
+            "args": [],
+            "stopAtEntry": false,
+            // "cwd": "${fileDirname}",
+            "environment": [],
+            "console": "externalTerminal",
+            // "preLaunchTask": "examples"
+        },
+        {
+            "name": "imgui_demo (macOS|Debug)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/examples/imgui_demo",
+            "args": [],
+            "stopAtEntry": false,
+            "environment": [],
+            "console": "externalTerminal",
+        },
+        {
+            "name": "client (macOS|Debug)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/client",
+            "args": [],
+            "stopAtEntry": false,
+            "environment": [],
+            "console": "externalTerminal",
+        },
         {
             "name": "imgui_demo (Win32|Debug)",
             "type": "cppvsdbg",

.vscode/settings.json

@@ -63,5 +63,6 @@
         "xtree": "cpp",
         "xutility": "cpp"
     },
-    "rust-analyzer.showUnlinkedFileNotification": false
+    "rust-analyzer.showUnlinkedFileNotification": false,
+    "rust-analyzer.checkOnSave": false
 }

Cargo.toml

@@ -44,13 +44,16 @@ libloading = "0.7.4"
 bevy_ecs.workspace = true
 ddsfile = "0.5.1"
 
+[build-dependencies]
+htwv = { path = "hotline-data/htwv" }
+
 [dependencies.imgui-sys]
 version = "0.9.0"
 features = ["docking"]
 
 [target.'cfg(target_os = "macos")'.dependencies]
 metal = "0.28.0"
-winit = "0.29.1"
+winit = "0.30"
 objc = "0.2.4"
 cocoa = "0.25.0"
 core-graphics-types = "0.1.3"
@@ -97,6 +100,10 @@ default = ["build_data", "client"]
 name = "bindless"
 crate-type = ["bin"]
 
+[[example]]
+name = "compute"
+crate-type = ["bin"]
+
 [[example]]
 name = "imgui_demo"
 crate-type = ["bin"]

build.rs

@@ -1,6 +1,11 @@
+use htwv;
+
 use std::process::Command;
 
+#[cfg(target_os = "windows")]
 fn main() {
+    println!("cargo:rerun-if-changed=shaders");
+
     if std::env::var("CARGO_FEATURE_BUILD_DATA").is_ok() {
         let pmbuild = "hotline-data\\pmbuild.cmd";
 
@@ -14,3 +19,30 @@ fn main() {
         }
     }
 }
+
+#[cfg(target_os = "macos")]
+fn main() {
+    use std::path::Path;
+
+    println!("cargo:rerun-if-changed=shaders");
+
+    if std::env::var("CARGO_FEATURE_BUILD_DATA").is_ok() {
+        let output_dir = Path::new("target/data/shaders");
+
+        let pmbuild = "pmbuild";
+        let status = Command::new(pmbuild)
+            .args(["mac-data"])
+            .status()
+            .unwrap_or_else(|e| panic!("failed to run '{pmbuild}': {e}"));
+
+        if !status.success() {
+            panic!("pmbuild mac-data failed with status: {status}");
+        }
+
+        println!("cargo:warning=Compiling shaders...");
+        match htwv::compile_dir("shaders", "target/data/shaders") {
+            Ok(_) => println!("cargo:warning=Shader compilation succeeded"),
+            Err(e) => println!("cargo:warning=Shader compilation errors:\n{e}"),
+        }
+    }
+}

client/main.rs

@@ -1,10 +1,27 @@
 use hotline_rs::*;
 use hotline_rs::prelude::*;
 
+#[cfg(target_os = "macos")]
+fn platform_dpi_aware() -> bool {
+    false
+}
+
+#[cfg(not(target_os = "macos"))]
+fn platform_dpi_aware() -> bool {
+    true
+}
+
 fn main() -> Result<(), hotline_rs::Error> {
 
+    std::panic::set_hook(Box::new(|info| {
+        let bt = std::backtrace::Backtrace::force_capture();
+        eprintln!("PANIC: {info}\n{bt}");
+        std::process::abort();
+    }));
+
     // create client
     let ctx : Client<gfx_platform::Device, os_platform::App> = Client::create(HotlineInfo {
+        dpi_aware: platform_dpi_aware(),
         ..Default::default()
     })?;
 

config.jsn

@@ -1,9 +1,14 @@
 {
     // configure build tools
     tools<windows>: {
-        pmfx: "hotline-data/bin/win32/pmfx/pmfx.exe"
+        pmfx: "py -3 hotline-data/pmfx-shader/pmfx.py"
         texturec: "hotline-data/bin/win32/texturec/texturec.exe"
-        pmfx_dev: "py -3 ../pmfx-shader/pmfx.py"
+        pmfx_dev: "py -3 hotline-data/pmfx-shader/pmfx.py"
+    }
+
+    tools<mac>: {
+        pmfx_dev: "python3 hotline-data/pmfx-shader/pmfx.py"
+        texturec: "hotline-data/bin/macos/texturec"
     }
 
     tools_help: {
@@ -15,7 +20,7 @@
         }
         pmfx_dev(pmfx): {}
     }
-    
+
     tools_update: {
         pmfx: {
             tag_name: latest
@@ -121,11 +126,10 @@
 
     // windows specific data, will also build (base)
     win32-data(base): {
-        pmfx: {
+        pmfx_dev: {
             args: [
                 "-shader_platform hlsl"
                 "-shader_version 6_5"
-
                 "-i ${src_shader_dir}/"
                 "-o ${data_dir}/shaders"
                 "-t ${temp_dir}/shaders"
@@ -137,12 +141,19 @@
                 "-Od"
             ]
         }
+    }
+
+    mac-data(base): {
         pmfx_dev: {
             explicit: true
             args: [
-                "-shader_platform hlsl"
-                "-shader_version 6_5"
-                "-i ${src_shader_dir}/"
+                "-shader_platform metal"
+                "-shader_version 6_0"
+                "-metal_version 2.3"
+                "-metal_sdk macosx"
+                "-discrete_binding 0"
+                "-discrete_binding 1"
+                "-i ${src_shader_dir}"
                 "-o ${data_dir}/shaders"
                 "-t ${temp_dir}/shaders"
                 "-num_threads 1"
@@ -153,21 +164,6 @@
         }
     }
 
-    rt_shaders: {
-        jsn_vars: {
-            output_dir: "target/data/shaders"
-        }
-        shell: {
-            commands: [
-                "hotline-data\\bin\\win32\\pmfx\\bin\\dxc\\dxc.exe -T lib_6_3 -E MyRaygenShader -Fo ${output_dir}/raygen.cso -I . shaders/raytracing_example.hlsl"
-                "hotline-data\\bin\\win32\\pmfx\\bin\\dxc\\dxc.exe -T lib_6_3 -E MyClosestHitShader -Fo ${output_dir}/closesthit.cso -I . shaders/raytracing_example.hlsl"
-                "hotline-data\\bin\\win32\\pmfx\\bin\\dxc\\dxc.exe -T lib_6_3 -E MyMissShader -Fo ${output_dir}/miss.cso -I . shaders/raytracing_example.hlsl"
-                "hotline-data\\bin\\win32\\pmfx\\bin\\dxc\\dxc.exe -T lib_6_3 -Fo ${output_dir}/lib.cso -I . shaders/raytracing_example.hlsl"
-            ]
-        }
-    }
-
-
     // win32 debug client, plugins and data
     win32-debug(win32-data, hotline): {
         copy: {