diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 41f75f4c..4c701d3d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -3,14 +3,20 @@ on: [push] name: push jobs: - renderling-build: + renderling-build-shaders: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: toolchain: stable - - run: cd shaders && cargo run --release && cd .. && cargo build + - run: | + rm -rf crates/renderling/src/linkage/*.spv + cd shaders && cargo run --release && cd .. + # ensure the shader binaries were properly checked in + git diff --exit-code --no-ext-diff crates/renderling/src/linkage + # ensure the shaders are valid for our uses (see renderling::linkage::validate_shaders) + cargo test -p renderling -- --nocapture linkage #renderling-test: # runs-on: [ubuntu-latest, gpu] diff --git a/crates/renderling/src/linkage/mod.rs b/crates/renderling/src/linkage/mod.rs index bc5c4bd9..d5bbe760 100644 --- a/crates/renderling/src/linkage/mod.rs +++ b/crates/renderling/src/linkage/mod.rs @@ -27,7 +27,7 @@ mod test { #[test] // Ensure that the shaders can be converted to WGSL. // This is necessary for WASM using WebGPU, because WebGPU only accepts - // WGSL as a shading language.:w + // WGSL as a shading language. fn validate_shaders() { fn validate_src(path: &std::path::PathBuf) -> Result<(), SrcError> { let bytes = std::fs::read(path).context(ReadSnafu)?; diff --git a/crates/renderling/src/linkage/stage-new_stage_vertex.spv b/crates/renderling/src/linkage/stage-new_stage_vertex.spv index 04e87513..d4e22e32 100644 Binary files a/crates/renderling/src/linkage/stage-new_stage_vertex.spv and b/crates/renderling/src/linkage/stage-new_stage_vertex.spv differ diff --git a/crates/renderling/src/linkage/stage-stage_fragment.spv b/crates/renderling/src/linkage/stage-stage_fragment.spv index bb08524f..f201ca3d 100644 Binary files a/crates/renderling/src/linkage/stage-stage_fragment.spv and b/crates/renderling/src/linkage/stage-stage_fragment.spv differ diff --git a/crates/renderling/src/linkage/tutorial-slabbed_render_unit.spv b/crates/renderling/src/linkage/tutorial-slabbed_render_unit.spv index db213e69..a1f3008c 100644 Binary files a/crates/renderling/src/linkage/tutorial-slabbed_render_unit.spv and b/crates/renderling/src/linkage/tutorial-slabbed_render_unit.spv differ diff --git a/crates/renderling/src/linkage/tutorial-slabbed_vertices.spv b/crates/renderling/src/linkage/tutorial-slabbed_vertices.spv index 21f23995..69157296 100644 Binary files a/crates/renderling/src/linkage/tutorial-slabbed_vertices.spv and b/crates/renderling/src/linkage/tutorial-slabbed_vertices.spv differ diff --git a/crates/renderling/src/linkage/tutorial-slabbed_vertices_no_instance.spv b/crates/renderling/src/linkage/tutorial-slabbed_vertices_no_instance.spv index b4182e97..72db0623 100644 Binary files a/crates/renderling/src/linkage/tutorial-slabbed_vertices_no_instance.spv and b/crates/renderling/src/linkage/tutorial-slabbed_vertices_no_instance.spv differ