Skip to content

add spirv-unknown-wgsl target via naga #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

add spirv-unknown-wgsl target via naga #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d37fac9
update spirv-tools 0.12.0
Firestar99 Jun 10, 2025
723c8f7
add vulkan1.3, vulkan1.4 and spv1.6 targets
Firestar99 Jun 6, 2025
b544bcc
compiletest: extend vulkan ignores to include 1.3 and 1.4
Firestar99 Jun 10, 2025
cba0eb6
difftest: replace error enums with anyhow
Firestar99 Jun 11, 2025
f9ea001
upgrade wgpu 23 -> 25
Firestar99 May 26, 2025
3ad98b9
`enum SpirvTargetEnv` containing all targets
Firestar99 Jun 13, 2025
5800320
wgsl: add `spirv-unknown-wgsl` target, transpiling with naga
Firestar99 Jun 12, 2025
1390aa5
spirv-std: never disable `read_shader_clock()` intrinsics based on ta…
Firestar99 Jun 16, 2025
62535a5
compiletest: remove ShaderClockKHR from implied target features, naga…
Firestar99 Jun 16, 2025
1df5fe5
wgsl: hide naga behind feature
Firestar99 Jun 16, 2025
8c2f8e3
wgsl: ignore wgsl in compile tests with unsupported extensions or ins…
Firestar99 Jun 16, 2025
9a2d6ab
wgsl: fix clippy
Firestar99 Jun 16, 2025
7ff21a6
wgsl: add experimental wgsl compiletest to ci
Firestar99 Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: cargo test -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools"

- name: workspace test (excluding examples & difftest)
run: cargo test --release --workspace --exclude "example-runner-*" --exclude "difftest*" --no-default-features --features "use-installed-tools"
run: cargo test --release --workspace --exclude "example-runner-*" --exclude "difftest*" --no-default-features --features use-installed-tools,include_str

# Examples
- name: cargo check examples
Expand Down Expand Up @@ -129,15 +129,27 @@ jobs:
compiletest:
name: Compiletest
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-24.04
target: x86_64-unknown-linux-gnu
target_env: vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4
experimental: false
- os: windows-2022
target: x86_64-pc-windows-msvc
target_env: vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4
experimental: false
- os: macOS-latest
target: aarch64-apple-darwin
target_env: vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4
experimental: false
- os: ubuntu-24.04
target: x86_64-unknown-linux-gnu
target_env: wgsl
experimental: true
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
steps:
- uses: actions/checkout@v4
- name: Install Vulkan SDK
Expand All @@ -151,7 +163,7 @@ jobs:
- name: cargo fetch --locked
run: cargo fetch --locked --target ${{ matrix.target }}
- name: compiletest
run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,spv1.3
run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env ${{ matrix.target_env }}

difftest:
name: Difftest
Expand Down
Loading
Loading