archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

fix(wgsl-in): accept trailing comma in @blend_src(…) attr. (#8137)

Browse Source
This commit is contained in:
Erich Gubler 2025-08-24 14:37:19 -04:00 committed by GitHub
parent c4a834e4f9
commit dd73743e78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -121,6 +121,10 @@ This allows using precompiled shaders without manually checking which backend's
- Fixed a bug where access to matrices with 2 rows would not work in some cases. By @andyleiserson in [#7438](https://github.com/gfx-rs/wgpu/pull/7438). - Fixed a bug where access to matrices with 2 rows would not work in some cases. By @andyleiserson in [#7438](https://github.com/gfx-rs/wgpu/pull/7438).
#### Naga
- [wgsl-in] Allow a trailing comma in `@blend_src(…)` attributes. By @ErichDonGubler in [#8137](https://github.com/gfx-rs/wgpu/pull/8137).
## v26.0.4 (2025-08-07) ## v26.0.4 (2025-08-07)
### Bug Fixes ### Bug Fixes

1
cts_runner/test.lst
View File

@ -58,6 +58,7 @@ webgpu:api,validation,encoding,programmable,pipeline_bind_group_compat:bind_grou
webgpu:api,validation,encoding,programmable,pipeline_bind_group_compat:buffer_binding,render_pipeline:* webgpu:api,validation,encoding,programmable,pipeline_bind_group_compat:buffer_binding,render_pipeline:*
webgpu:api,validation,encoding,programmable,pipeline_bind_group_compat:sampler_binding,render_pipeline:* webgpu:api,validation,encoding,programmable,pipeline_bind_group_compat:sampler_binding,render_pipeline:*
webgpu:api,validation,encoding,queries,general:occlusion_query,query_index:* webgpu:api,validation,encoding,queries,general:occlusion_query,query_index:*
webgpu:shader,validation,extension,dual_source_blending:blend_src_syntax_validation:*
webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_usage_and_aspect:* webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_usage_and_aspect:*
webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_buffer_size:* webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_buffer_size:*
fails-if(dx12) webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_buffer_offset:format="depth32float";aspect="depth-only";copyType="CopyT2B" fails-if(dx12) webgpu:api,validation,image_copy,buffer_texture_copies:depth_stencil_format,copy_buffer_offset:format="depth32float";aspect="depth-only";copyType="CopyT2B"

1
naga/src/front/wgsl/parse/mod.rs
View File

@ -235,6 +235,7 @@ impl<'a> BindingParser<'a> {
lexer.expect(Token::Paren('('))?; lexer.expect(Token::Paren('('))?;
self.blend_src self.blend_src
.set(parser.general_expression(lexer, ctx)?, name_span)?; .set(parser.general_expression(lexer, ctx)?, name_span)?;
lexer.skip(Token::Separator(','));
lexer.expect(Token::Paren(')'))?; lexer.expect(Token::Paren(')'))?;
} }
_ => return Err(Box::new(Error::UnknownAttribute(name_span))), _ => return Err(Box::new(Error::UnknownAttribute(name_span))),