brody4hire · brody4hire · Jan 17, 2025 · Jan 19, 2025 · Jan 19, 2025 · Jan 19, 2025
diff --git a/.deny.toml b/.deny.toml
@@ -36,6 +36,7 @@ allow = [
     "Unicode-3.0",
     "Zlib",
 ]
+private = { ignore = true }
 
 [sources]
 allow-git = [

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,11 +3,11 @@ name: CI
 on:
   push:
     branches-ignore: [
-      # We don't need to run on dependabot PRs.
-      "dependabot/**",
-      # This is the branch the merge queue creates.
-      "gh-readonly-queue/**"
-    ]
+        # We don't need to run on dependabot PRs.
+        "dependabot/**",
+        # This is the branch the merge queue creates.
+        "gh-readonly-queue/**",
+      ]
     tags: [v0.*]
   pull_request:
   merge_group:
@@ -20,7 +20,7 @@ env:
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
   #
   # We don't include the 4th version number, as it's not used in any URL.
-  VULKAN_SDK_VERSION: "1.3.290"
+  VULKAN_SDK_VERSION: "1.4.304"
   # Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP
   WARP_VERSION: "1.0.13"
 
@@ -56,6 +56,7 @@ env:
   RUST_LOG: debug
   RUST_BACKTRACE: full
   PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
+  # XXX TODO CONFIGURE THIS PER JOB - NOT ALL JOBS SHOULD FAIL WITH CARGO WARNINGS
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
   WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
@@ -161,15 +162,15 @@ jobs:
             target: wasm32-unknown-emscripten
             tier: 2
             kind: wgpu-only
-          
+
           # TODO: Uncomment once web-sys updates past 0.3.76
           # See https://github.com/rustwasm/wasm-bindgen/pull/4378 for details
           # - name: WebAssembly Core 1.0
           #   os: ubuntu-22.04
           #   target: wasm32v1-none
           #   tier: 2
           #   kind: no_std
-          
+
           # Bare-metal x86-64
           # TODO: Remove once web-sys updates past 0.3.76
           # Included while wasm32v1-none is failing to ensure `no_std` does not regress
@@ -179,6 +180,13 @@ jobs:
             tier: 2
             kind: no_std
 
+          # XXX TODO MOVE INTO SEPARATE CI JOB:
+          - name: no-std feature test - Linux x86_64
+            os: ubuntu-22.04
+            target: x86_64-unknown-linux-gnu
+            tier: 1
+            kind: no-std-feature-test
+
     name: Clippy ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
 
@@ -276,19 +284,23 @@ jobs:
           # Check with all features.
           cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --all-features
           cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --all-features
-        
+
       # Building for no_std platforms where every feature is enabled except "std".
       - name: check no_std
         if: matrix.kind == 'no_std'
         shell: bash
         run: |
           set -e
 
-          # check with no features
+          # Check wgpu-types with no features.
           cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features
+          # Check naga with no features.
+          cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features
 
-          # Check with all features except "std".
+          # Check wgpu-types with all features except "std".
           cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters
+          # Check naga with all features possible for no-std.
+          cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,glsl-out,msl-out
 
       # Building for native platforms with standard tests.
       - name: check native
@@ -306,6 +318,20 @@ jobs:
           # build docs
           cargo doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --all-features --no-deps
 
+      # XXX TODO MOVE INTO SEPARATE CI JOB - MAY SHOW UP AS A "Clippy" job in GitHub CI
+      - name: no-std feature test
+        if: matrix.kind == 'no-std-feature-test'
+        shell: bash
+        run: |
+          set -e
+
+          # no-std feature test with no features - naga
+          cargo test --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features
+
+          # XXX TODO FIX & TEST MULTIPLE naga features for no-std
+          # no-std test with multiple features - naga
+          # cargo test [...]
+
       - name: check private item docs
         if: matrix.kind == 'native'
         shell: bash

diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
@@ -0,0 +1,60 @@
+name: cargo-generate
+
+on:
+  push:
+    branches: ["*"]
+    tags: [v0.*]
+  pull_request:
+  merge_group:
+
+env:
+  #
+  # Dependency versioning
+  #
+
+  # This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
+  REPO_MSRV: "1.83"
+  RUSTFLAGS: -D warnings
+
+jobs:
+  cargo-generate:
+    timeout-minutes: 5
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "01-hello-compute"
+            path: "examples/standalone/01_hello_compute"
+
+    name: "${{ matrix.name }}"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Repo MSRV toolchain
+        run: |
+          rustup toolchain install ${{ env.REPO_MSRV }} --no-self-update --profile=minimal
+          rustup override set ${{ env.REPO_MSRV }}
+          cargo -V
+
+      - name: "Install cargo-generate"
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-generate
+
+      - name: "Run cargo-generate"
+        run: |
+          cd ..
+          cargo generate --path wgpu --name ${{ matrix.name }} ${{ matrix.path }}
+
+      - name: "Check generated files"
+        run: |
+          cd ../${{ matrix.name }}/
+          cat <<EOF >> Cargo.toml
+            [patch.crates-io]
+            wgpu = { path = "../wgpu/wgpu" }
+          EOF
+          cargo check
diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml
@@ -3,11 +3,11 @@ name: Shaders
 on:
   push:
     branches-ignore: [
-      # We don't need to run on dependabot PRs.
-      "dependabot/**",
-      # This is the branch the merge queue creates.
-      "gh-readonly-queue/**"
-    ]
+        # We don't need to run on dependabot PRs.
+        "dependabot/**",
+        # This is the branch the merge queue creates.
+        "gh-readonly-queue/**",
+      ]
     tags: [v0.*]
   pull_request:
   merge_group:
@@ -16,9 +16,7 @@ env:
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
   #
   # We don't include the 4th version number, as it's not used in any URL.
-  #
-  # Held back from 1.3.290 by https://github.com/gfx-rs/wgpu/issues/6307
-  VULKAN_SDK_VERSION: "1.3.283"
+  VULKAN_SDK_VERSION: "1.4.304"
 
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
   #
@@ -89,7 +87,7 @@ jobs:
 
   naga-validate-linux:
     name: "Validate: SPIR-V/GLSL/DOT/WGSL"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -102,7 +100,7 @@ jobs:
 
           # vulkan sdk
           wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-jammy.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-jammy.list
+          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
 
           sudo apt-get update
           sudo apt install -y vulkan-sdk

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,12 @@ Bottom level categories:
 
 ## Unreleased
 
+### Major changes
+
+#### no-std support in naga
+
+XXX TODO
+
 ### New Features
 
 #### Naga

diff --git a/Cargo.lock b/Cargo.lock