Skip to content
This repository has been archived by the owner on Jan 29, 2025. It is now read-only.

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

Merged
merged 1 commit into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/front/wgsl/lower/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())?;
Expand Down Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions src/front/wgsl/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
}
}