From aed6771a202fa7b81ffcc9510f9ea35a6f84e88d Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Wed, 9 Sep 2026 09:00:02 -0700 Subject: [PATCH] fix(naga): Fix compilation error when glsl-in enabled in isolation (#10297) --- .github/workflows/ci.yml | 5 +++++ naga/src/front/mod.rs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fc2153c0..fa2bd68f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -367,6 +367,11 @@ jobs: cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features metal cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features dx12 + # Check important naga features in isolation + for feature in glsl-in glsl-out hlsl-out msl-out spv-in spv-out wgsl-in wgsl-out; do + cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features $feature + done + # build docs cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --all-features --no-deps diff --git a/naga/src/front/mod.rs b/naga/src/front/mod.rs index b2b1fbc93..2afa6f1be 100644 --- a/naga/src/front/mod.rs +++ b/naga/src/front/mod.rs @@ -2,7 +2,7 @@ Frontend parsers that consume binary and text shaders and load them into [`Module`](super::Module)s. */ -#[cfg(any(feature = "spv-in", feature = "wgsl-in"))] +#[cfg(any(feature = "glsl-in", feature = "spv-in", feature = "wgsl-in"))] pub(crate) mod interpolator; mod type_gen;