f7fdf6b560
The snapshot files in tests/out start with headers like this:
---
source: tests/snapshots.rs
expression: dis
---
; SPIR-V
; Version: 1.0
; Generator: rspirv
...
The Makefile's `validate-foo` targets trim off those lines with `tail -n +5`
before submitting their test to the validators.
However, some versions of the `insta` crate seem to generate headers with an
extra blank line, like this:
---
source: tests/snapshots.rs
expression: dis
---
This makes the `validate-foo` targets unhappy.
This commit changes the `validate-foo` targets to use `sed` to cope with both
kinds of headers.
|
||
|---|---|---|
| .github/workflows | ||
| bin | ||
| fuzz | ||
| src | ||
| tests | ||
| .gitignore | ||
| .monocodus | ||
| Cargo.toml | ||
| CHANGELOG.md | ||
| LICENSE-APACHE | ||
| LICENSE-MIT | ||
| Makefile | ||
| README.md | ||
Naga
This is an experimental shader translation library for the needs of gfx-rs project and WebGPU.
Supported end-points
Everything is still work-in-progress, but some end-points are usable:
| Front-end | Status | Feature | Notes |
|---|---|---|---|
| SPIR-V (binary) | ✅ | spv-in | |
| WGSL | ✅ | wgsl-in | |
| GLSL | 🆗 | glsl-in | Vulkan flavor is expected |
| Rust |
| Back-end | Status | Feature | Notes |
|---|---|---|---|
| SPIR-V | ✅ | spv-out | |
| WGSL | |||
| Metal | ✅ | msl-out | |
| HLSL | 🚧 | hlsl-out | |
| GLSL | 🆗 | glsl-out | |
| AIR | |||
| DXIL/DXIR | |||
| DXBC | |||
| DOT (GraphViz) | 🆗 | dot-out | Not a shading language |
✅ = Primary support — 🆗 = Secondary support — 🚧 = Unsupported, but support in progress
Conversion tool
Naga includes a default binary target "convert", which allows to test the conversion of different code paths.
cargo run --features spv-in -- my_shader.spv # dump the IR module to debug output
cargo run --features spv-in,msl-out -- my_shader.spv my_shader.metal --flow-dir flow-dir # convert the SPV to Metal, also dump the SPIR-V flow graph to `flow-dir`
cargo run --features wgsl-in,glsl-out -- my_shader.wgsl my_shader.vert --profile es310 # convert the WGSL to GLSL vertex stage under ES 3.20 profile
Development workflow
The main instrument aiding the development is the good old cargo test --all-features,
which will run the snapshot tests as well as the unit tests.
Any changes in the snapshots would then have to be reviewed with cargo insta review
before being accepted into the code.
If working on a particular front-end or back-end, it may be convenient to
enable the relevant features in Cargo.toml, e.g.
default = ["spv-out"] #TEMP!
This allows IDE basic checks to report errors there, unless your IDE is sufficiently configurable already.
Finally, when changes to the snapshots are made, we should verify that the produced shaders
are indeed valid for the target platforms they are compiled for. We automate this with Makefile:
make validate-spv # for Vulkan shaders, requires SPIRV-Tools installed
make validate-msl # for Metal shaders, requires XCode command-line tools installed
make validate-glsl # for OpenGL shaders, requires GLSLang installed