diff --git a/CHANGELOG.md b/CHANGELOG.md index 0810c5aa12..c17a2c1ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -241,6 +241,7 @@ By @wumpf in [#6849](https://github.com/gfx-rs/wgpu/pull/6849). - Fix crash when a texture argument is missing. By @aedm in [#6486](https://github.com/gfx-rs/wgpu/pull/6486) - Emit an error in constant evaluation, rather than crash, in certain cases where `vecN` constructors have less than N arguments. By @ErichDonGubler in [#6508](https://github.com/gfx-rs/wgpu/pull/6508). +- Fix an error in template list matching `>=` in `a=c`. By @KentSlaney in [#6898](https://github.com/gfx-rs/wgpu/pull/6898). - Correctly validate handles in override-sized array types. By @jimblandy in [#6882](https://github.com/gfx-rs/wgpu/pull/6882). - Clean up validation of `Statement::ImageStore`. By @jimblandy in [#6729](https://github.com/gfx-rs/wgpu-pull/6729). - In compaction, avoid cloning the type arena. By @jimblandy in [#6790](https://github.com/gfx-rs/wgpu-pull/6790) diff --git a/naga/src/front/wgsl/parse/mod.rs b/naga/src/front/wgsl/parse/mod.rs index 7d8a390c0e..739a1b15c6 100644 --- a/naga/src/front/wgsl/parse/mod.rs +++ b/naga/src/front/wgsl/parse/mod.rs @@ -950,9 +950,6 @@ impl Parser { match enclosing { Some(Rule::GenericExpr) => |token| match token { Token::LogicalOperation('<') => Some(crate::BinaryOperator::LessEqual), - Token::LogicalOperation('>') => { - Some(crate::BinaryOperator::GreaterEqual) - } _ => None, }, _ => |token| match token { diff --git a/naga/tests/in/template-list-ge.wgsl b/naga/tests/in/template-list-ge.wgsl new file mode 100644 index 0000000000..87511cc64d --- /dev/null +++ b/naga/tests/in/template-list-ge.wgsl @@ -0,0 +1,10 @@ +@group(0) @binding(0) +var out: array; + +@compute @workgroup_size(1) +fn main() { + var tmp: array=array(1, 2); + for (var i = 0; i < 2; i++) { + out[i] = tmp[i]; + } +}