github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[wgsl-in] Fix error message for invalid texture{Load,Store}() on 2d_array (#2432)

Browse Source 
Fixes https://github.com/gfx-rs/naga/issues/2431
This commit is contained in:
Fredrik Fornwall
2023-08-11 16:35:41 +02:00
committed by GitHub
parent bd74b11b4c
commit 30afa5bd1f
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/front/wgsl/lower/mod.rs
View File

@@ -1937,7 +1937,10 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
let (_, arrayed) = ctx.image_data(image, image_span)?;
let array_index = arrayed
.then(|| self.expression(args.next()?, ctx.reborrow()))
.then(|| {
args.min_args += 1;
self.expression(args.next()?, ctx.reborrow())
})
.transpose()?;
let value = self.expression(args.next()?, ctx.reborrow())?;
@@ -1968,7 +1971,10 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
let (class, arrayed) = ctx.image_data(image, image_span)?;
let array_index = arrayed
.then(|| self.expression(args.next()?, ctx.reborrow()))
.then(|| {
args.min_args += 1;
self.expression(args.next()?, ctx.reborrow())
})
.transpose()?;
let level = class

28
src/front/wgsl/tests.rs
View File

@@ -481,3 +481,31 @@ fn parse_alias() {
)
.unwrap();
}
#[test]
fn parse_texture_load_store_expecting_four_args() {
for (func, texture) in [
(
"textureStore",
"texture_storage_2d_array<rg11b10float, write>",
),
("textureLoad", "texture_2d_array<i32>"),
] {
let error = parse_str(&format!(
"
@group(0) @binding(0) var tex_los_res: {texture};
@compute
@workgroup_size(1)
fn main(@builtin(global_invocation_id) id: vec3<u32>) {{
var color = vec4(1, 1, 1, 1);
{func}(tex_los_res, id, color);
}}
"
))
.unwrap_err();
assert_eq!(
error.message(),
"wrong number of arguments: expected 4, found 3"
);
}
}