build: move from make to cargo xtask workflows

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+xtask = "run --manifest-path xtask/Cargo.toml --"

.github/workflows/validation-linux.yml

@@ -8,6 +8,7 @@ on:
       - 'tests/out/dot/*.dot'
       - 'tests/out/wgsl/*.wgsl'
       - 'src/front/wgsl/*'
+      - 'xtask/**'
 
 jobs:
   validate-linux:
@@ -19,10 +20,15 @@ jobs:
       - name: Install tools
         run: sudo apt-get install spirv-tools glslang-tools graphviz
 
-      - run: make validate-spv
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            xtask -> target
 
-      - run: make validate-glsl
+      - run: cargo xtask validate spv
 
-      - run: make validate-dot
+      - run: cargo xtask validate glsl
 
-      - run: make validate-wgsl
+      - run: cargo xtask validate dot
+
+      - run: cargo xtask validate wgsl

.github/workflows/validation-macos.yml

@@ -4,6 +4,7 @@ on:
     paths:
       - '.github/workflows/validation-macos.yml'
       - 'tests/out/msl/*.msl'
+      - 'xtask/**'
 
 jobs:
   validate-macos:
@@ -12,4 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - run: make validate-msl
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            xtask -> target
+
+      - run: cargo xtask validate msl

.github/workflows/validation-windows.yml

@@ -4,6 +4,8 @@ on:
     paths:
       - '.github/workflows/validation-windows.yml'
       - 'tests/out/hlsl/*.hlsl'
+      - 'tests/out/hlsl/*.ron'
+      - 'xtask/**'
 
 jobs:
   validate-windows-dxc:
@@ -15,8 +17,12 @@ jobs:
       - name: Add DirectXShaderCompiler
         uses: napokue/setup-dxc@v1.1.0
 
-      - run: make validate-hlsl-dxc
-        shell: sh
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            xtask -> target
+
+      - run: cargo xtask validate hlsl dxc
 
   validate-windows-fxc:
     name: HLSL via FXC
@@ -33,5 +39,9 @@ jobs:
           | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
         shell: powershell
 
-      - run: make validate-hlsl-fxc
-        shell: sh
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            xtask -> target
+
+      - run: cargo xtask validate hlsl fxc

Cargo.toml

@@ -68,14 +68,15 @@ unicode-xid = { version = "0.2.3", optional = true }
 bincode = "1"
 criterion = { version = "0.3", features = [] }
 diff = "0.1"
+env_logger = "0.9"
+hlsl-snapshots = { path = "./xtask/hlsl-snapshots"}
 # Require at least version 0.7.1 of ron, this version changed how floating points are
 # serialized by forcing them to always have the decimal part, this makes it backwards
 # incompatible with our tests because we do a syntatic diff and not a semantic one.
 ron = "~0.7.1"
+rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
 serde = { version = "1.0", features = ["derive"] }
 spirv = { version = "0.2", features = ["deserialize"] }
-rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
-env_logger = "0.9"
 
 [workspace]
 members = [".", "cli"]

tests/out/hlsl/access.ron

@@ -0,0 +1,20 @@
+(
+    vertex:[
+        (
+            entry_point:"foo_vert",
+            target_profile:"vs_5_1",
+        ),
+    ],
+    fragment:[
+        (
+            entry_point:"foo_frag",
+            target_profile:"ps_5_1",
+        ),
+    ],
+    compute:[
+        (
+            entry_point:"assign_through_ptr",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/array-in-ctor.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"cs_main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/atomicOps.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"cs_main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/binding-arrays.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+        (
+            entry_point:"main",
+            target_profile:"ps_5_1",
+        ),
+    ],
+    compute:[
+    ],
+)

tests/out/hlsl/bitcast.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/boids.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/break-if.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/collatz.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)

tests/out/hlsl/control-flow.ron

@@ -0,0 +1,12 @@
+(
+    vertex:[
+    ],
+    fragment:[
+    ],
+    compute:[
+        (
+            entry_point:"main",
+            target_profile:"cs_5_1",
+        ),
+    ],
+)