fix: rebuilt shader linkage should only create a diff if Rust code has changed

.cargo/config.toml

@@ -4,7 +4,3 @@ shaders = "gpu toml crates/renderling"
 [build]
 rustflags = ["--cfg=web_sys_unstable_apis"]
 rustdocflags = ["--cfg=web_sys_unstable_apis"]
-
-
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-Zshare-generics=off"]

.gitattributes

@@ -1,2 +1,3 @@
+* text=auto
 *.spv binary
 *.wgsl binary

.github/workflows/push.yaml

@@ -1,3 +1,4 @@
+# Happens on push to main, and all PRs
 name: push
 
 on: 
@@ -11,35 +12,86 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
+  # Installs `cargo-gpu` and sets the cache directory for subsequent jobs
+  install-cargo-gpu:
+    strategy:
+      matrix: 
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run: 
+        shell: bash
+    env:
+      RUST_LOG: debug  
+      RUNNER_OS: ${{ matrix.os }}
+    outputs:
+      cachepath-macOS: ${{ steps.cachepathstep.outputs.cachepath-macOS }}
+      cachepath-Linux: ${{ steps.cachepathstep.outputs.cachepath-Linux }}
+      cachepath-Windows: ${{ steps.cachepathstep.outputs.cachepath-Windows }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v4
+        with:
+          path: ~/.cargo
+          key: cargo-cache-${{ runner.os }}
+      - uses: moonrepo/setup-rust@v1
+      - run: rustup default stable 
+      - run: rustup update
+      - run: cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
+      - id: cachepathstep
+        run: |
+          CACHE_PATH=`cargo gpu show --cache-directory`
+          echo $CACHE_PATH
+          echo "cachepath-$RUNNER_OS=$CACHE_PATH" >> "$GITHUB_OUTPUT"
+
+  # Builds the shaders and ensures there is no git diff
   renderling-build-shaders:
-    runs-on: ubuntu-latest
+    needs: install-cargo-gpu
+    strategy:
+      matrix: 
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run: 
+        shell: bash
+    env:
+      RUST_LOG: debug
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v4
         with:
-          path: ~/.cache/rust-gpu
-          key: 0-${{ runner.os }}
+          path: ~/.cargo
+          key: cargo-cache-${{ runner.os }}
+      - uses: actions/cache@v4
+        with:
+          path: | 
+              ${{ needs.install-cargo-gpu.outputs.cachepath-macOS }}
+              ${{ needs.install-cargo-gpu.outputs.cachepath-Linux }}
+              ${{ needs.install-cargo-gpu.outputs.cachepath-Windows }}
+          key: rust-gpu-cache-0-${{ runner.os }}
       - uses: moonrepo/setup-rust@v1
-      - run: RUST_LOG=trace cargo install --git https://github.com/rust-gpu/cargo-gpu 
       - run: rm -rf crates/renderling/src/linkage/* crates/renderling/shaders
-      - run: RUST_LOG=trace cargo shaders
+      - run: cargo shaders
       - run: cargo build -p renderling
       - run: git diff --exit-code --no-ext-diff
 
+  # BAU clippy lints
   renderling-clippy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: moonrepo/setup-rust@v1
       - run: cargo clippy
 
+  # Ensures the example glTF viewer compiles
   renderling-build-example:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2 
       - uses: moonrepo/setup-rust@v1
       - run: cargo build -p example
 
+  # BAU tests
   renderling-test-linux:
     runs-on: ubuntu-latest 
     steps: 

crates/renderling/Cargo.toml

@@ -47,7 +47,6 @@ spirv-std = { version = "0.9" }
 # dependencies for GPU code
 [target.'cfg(target_arch = "spirv")'.dependencies]
 crabslab = { workspace = true, features = ["glam"]  }
-half = { version = "2.3", default-features = false }
 glam = { workspace = true, default-features = false, features = ["libm"] }
 
 # dependencies for CPU code

crates/renderling/src/color.rs

@@ -16,6 +16,7 @@ pub fn linear_xfer_u16(c: &mut u16) {
     *c = ((*c as f32 / 65535.0).powf(2.2) * 65535.0) as u16;
 }
 
+#[cfg(not(target_arch = "spirv"))]
 pub fn linear_xfer_f16(c: &mut u16) {
     let mut f = half::f16::from_bits(*c).to_f32();
     linear_xfer_f32(&mut f);

gltf/SimpleSkin.gltf

@@ -1,131 +1,131 @@
-{
-  "scene" : 0,
-  "scenes" : [ {
-    "nodes" : [ 0, 1 ]
-  } ],
-  
-  "nodes" : [ {
-    "skin" : 0,
-    "mesh" : 0
-  }, {
-    "children" : [ 2 ]
-  }, {
-    "translation" : [ 0.0, 1.0, 0.0 ],
-    "rotation" : [ 0.0, 0.0, 0.0, 1.0 ]
-  } ],
-  
-  "meshes" : [ {
-    "primitives" : [ {
-      "attributes" : {
-        "POSITION" : 1,
-        "JOINTS_0" : 2,
-        "WEIGHTS_0" : 3
-      },
-      "indices" : 0
-    } ]
-  } ],
-
-  "skins" : [ {
-    "inverseBindMatrices" : 4,
-    "joints" : [ 1, 2 ]
-  } ],
-  
-  "animations" : [ {
-    "channels" : [ {
-      "sampler" : 0,
-      "target" : {
-        "node" : 2,
-        "path" : "rotation"
-      }
-    } ],
-    "samplers" : [ {
-      "input" : 5,
-      "interpolation" : "LINEAR",
-      "output" : 6
-    } ]
-  } ],
-  
-  "buffers" : [ {
-    "uri" : "data:application/gltf-buffer;base64,AAABAAMAAAADAAIAAgADAAUAAgAFAAQABAAFAAcABAAHAAYABgAHAAkABgAJAAgAAAAAvwAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAvwAAAD8AAAAAAAAAPwAAAD8AAAAAAAAAvwAAgD8AAAAAAAAAPwAAgD8AAAAAAAAAvwAAwD8AAAAAAAAAPwAAwD8AAAAAAAAAvwAAAEAAAAAAAAAAPwAAAEAAAAAA",
-    "byteLength" : 168
-  }, {
-    "uri" : "data:application/gltf-buffer;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAABAPwAAgD4AAAAAAAAAAAAAQD8AAIA+AAAAAAAAAAAAAAA/AAAAPwAAAAAAAAAAAAAAPwAAAD8AAAAAAAAAAAAAgD4AAEA/AAAAAAAAAAAAAIA+AABAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAA=",
-    "byteLength" : 320
-  }, {
-    "uri" : "data:application/gltf-buffer;base64,AACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/AAAAAAAAgD8=",
-    "byteLength" : 128
-  }, {
-    "uri" : "data:application/gltf-buffer;base64,AAAAAAAAAD8AAIA/AADAPwAAAEAAACBAAABAQAAAYEAAAIBAAACQQAAAoEAAALBAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAPT9ND/0/TQ/AAAAAAAAAAD0/TQ/9P00PwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAPT9NL/0/TQ/AAAAAAAAAAD0/TS/9P00PwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAAAAAAAAAIA/",
-    "byteLength" : 240
-  } ],
-  
-  "bufferViews" : [ {
-    "buffer" : 0,
-    "byteLength" : 48,
-    "target" : 34963
-  }, {
-    "buffer" : 0,
-    "byteOffset" : 48,
-    "byteLength" : 120,
-    "target" : 34962
-  }, {
-    "buffer" : 1,
-    "byteLength" : 320,
-    "byteStride" : 16
-  }, {
-    "buffer" : 2,
-    "byteLength" : 128
-  }, {
-    "buffer" : 3,
-    "byteLength" : 240
-  } ],
-
-  "accessors" : [ {
-    "bufferView" : 0,
-    "componentType" : 5123,
-    "count" : 24,
-    "type" : "SCALAR"
-  }, {
-    "bufferView" : 1,
-    "componentType" : 5126,
-    "count" : 10,
-    "type" : "VEC3",
-    "max" : [ 0.5, 2.0, 0.0 ],
-    "min" : [ -0.5, 0.0, 0.0 ]
-  }, {
-    "bufferView" : 2,
-    "componentType" : 5123,
-    "count" : 10,
-    "type" : "VEC4"
-  }, {
-    "bufferView" : 2,
-    "byteOffset" : 160,
-    "componentType" : 5126,
-    "count" : 10,
-    "type" : "VEC4"
-  }, {
-    "bufferView" : 3,
-    "componentType" : 5126,
-    "count" : 2,
-    "type" : "MAT4"
-  }, {
-    "bufferView" : 4,
-    "componentType" : 5126,
-    "count" : 12,
-    "type" : "SCALAR",
-    "max" : [ 5.5 ],
-    "min" : [ 0.0 ]
-  }, {
-    "bufferView" : 4,
-    "byteOffset" : 48,
-    "componentType" : 5126,
-    "count" : 12,
-    "type" : "VEC4",
-    "max" : [ 0.0, 0.0, 0.707, 1.0 ],
-    "min" : [ 0.0, 0.0, -0.707, 0.707 ]
-  } ],
- 
-  "asset" : {
-    "version" : "2.0"
-  }
+{
+  "scene" : 0,
+  "scenes" : [ {
+    "nodes" : [ 0, 1 ]
+  } ],
+
+  "nodes" : [ {
+    "skin" : 0,
+    "mesh" : 0
+  }, {
+    "children" : [ 2 ]
+  }, {
+    "translation" : [ 0.0, 1.0, 0.0 ],
+    "rotation" : [ 0.0, 0.0, 0.0, 1.0 ]
+  } ],
+
+  "meshes" : [ {
+    "primitives" : [ {
+      "attributes" : {
+        "POSITION" : 1,
+        "JOINTS_0" : 2,
+        "WEIGHTS_0" : 3
+      },
+      "indices" : 0
+    } ]
+  } ],
+
+  "skins" : [ {
+    "inverseBindMatrices" : 4,
+    "joints" : [ 1, 2 ]
+  } ],
+
+  "animations" : [ {
+    "channels" : [ {
+      "sampler" : 0,
+      "target" : {
+        "node" : 2,
+        "path" : "rotation"
+      }
+    } ],
+    "samplers" : [ {
+      "input" : 5,
+      "interpolation" : "LINEAR",
+      "output" : 6
+    } ]
+  } ],
+
+  "buffers" : [ {
+    "uri" : "data:application/gltf-buffer;base64,AAABAAMAAAADAAIAAgADAAUAAgAFAAQABAAFAAcABAAHAAYABgAHAAkABgAJAAgAAAAAvwAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAvwAAAD8AAAAAAAAAPwAAAD8AAAAAAAAAvwAAgD8AAAAAAAAAPwAAgD8AAAAAAAAAvwAAwD8AAAAAAAAAPwAAwD8AAAAAAAAAvwAAAEAAAAAAAAAAPwAAAEAAAAAA",
+    "byteLength" : 168
+  }, {
+    "uri" : "data:application/gltf-buffer;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAABAPwAAgD4AAAAAAAAAAAAAQD8AAIA+AAAAAAAAAAAAAAA/AAAAPwAAAAAAAAAAAAAAPwAAAD8AAAAAAAAAAAAAgD4AAEA/AAAAAAAAAAAAAIA+AABAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAA=",
+    "byteLength" : 320
+  }, {
+    "uri" : "data:application/gltf-buffer;base64,AACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/AAAAAAAAgD8=",
+    "byteLength" : 128
+  }, {
+    "uri" : "data:application/gltf-buffer;base64,AAAAAAAAAD8AAIA/AADAPwAAAEAAACBAAABAQAAAYEAAAIBAAACQQAAAoEAAALBAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAPT9ND/0/TQ/AAAAAAAAAAD0/TQ/9P00PwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAPT9NL/0/TQ/AAAAAAAAAAD0/TS/9P00PwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAAAAAAAAAIA/",
+    "byteLength" : 240
+  } ],
+
+  "bufferViews" : [ {
+    "buffer" : 0,
+    "byteLength" : 48,
+    "target" : 34963
+  }, {
+    "buffer" : 0,
+    "byteOffset" : 48,
+    "byteLength" : 120,
+    "target" : 34962
+  }, {
+    "buffer" : 1,
+    "byteLength" : 320,
+    "byteStride" : 16
+  }, {
+    "buffer" : 2,
+    "byteLength" : 128
+  }, {
+    "buffer" : 3,
+    "byteLength" : 240
+  } ],
+
+  "accessors" : [ {
+    "bufferView" : 0,
+    "componentType" : 5123,
+    "count" : 24,
+    "type" : "SCALAR"
+  }, {
+    "bufferView" : 1,
+    "componentType" : 5126,
+    "count" : 10,
+    "type" : "VEC3",
+    "max" : [ 0.5, 2.0, 0.0 ],
+    "min" : [ -0.5, 0.0, 0.0 ]
+  }, {
+    "bufferView" : 2,
+    "componentType" : 5123,
+    "count" : 10,
+    "type" : "VEC4"
+  }, {
+    "bufferView" : 2,
+    "byteOffset" : 160,
+    "componentType" : 5126,
+    "count" : 10,
+    "type" : "VEC4"
+  }, {
+    "bufferView" : 3,
+    "componentType" : 5126,
+    "count" : 2,
+    "type" : "MAT4"
+  }, {
+    "bufferView" : 4,
+    "componentType" : 5126,
+    "count" : 12,
+    "type" : "SCALAR",
+    "max" : [ 5.5 ],
+    "min" : [ 0.0 ]
+  }, {
+    "bufferView" : 4,
+    "byteOffset" : 48,
+    "componentType" : 5126,
+    "count" : 12,
+    "type" : "VEC4",
+    "max" : [ 0.0, 0.0, 0.707, 1.0 ],
+    "min" : [ 0.0, 0.0, -0.707, 0.707 ]
+  } ],
+
+  "asset" : {
+    "version" : "2.0"
+  }
 }