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] fix and update storage load

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-01-26 15:45:05 -05:00
committed by Dzmitry Malyshau
parent ce15aa62fc
commit 986550aff8
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/front/wgsl/mod.rs
View File

@@ -665,12 +665,12 @@ impl Parser {
None
};
let index = match class {
crate::ImageClass::Storage(_) => {
crate::ImageClass::Storage(_) => None,
// it's the MSAA index for multi-sampled, and LOD for the others
crate::ImageClass::Sampled { .. } | crate::ImageClass::Depth => {
lexer.expect(Token::Separator(','))?;
let index_name = lexer.next_ident()?;
Some(ctx.lookup_ident.lookup(index_name)?)
Some(self.parse_general_expression(lexer, ctx.reborrow())?)
}
crate::ImageClass::Sampled { .. } | crate::ImageClass::Depth => None,
};
lexer.expect(Token::Paren(')'))?;
Some(crate::Expression::ImageLoad {
@@ -1411,6 +1411,14 @@ impl Parser {
class: crate::ImageClass::Sampled { kind, multi: true },
}
}
"texture_multisampled_2d_array" => {
let (kind, _) = lexer.next_scalar_generic()?;
crate::TypeInner::Image {
dim: crate::ImageDimension::D2,
arrayed: true,
class: crate::ImageClass::Sampled { kind, multi: true },
}
}
"texture_depth_2d" => crate::TypeInner::Image {
dim: crate::ImageDimension::D2,
arrayed: false,

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

@@ -116,3 +116,34 @@ fn parse_switch() {
)
.unwrap();
}
#[test]
fn parse_texture_load() {
parse_str(
"
var t: texture_3d<u32>;
fn foo() {
const r: vec4<u32> = textureLoad(t, vec3<u32>(0.0, 1.0, 2.0), 1);
}
",
)
.unwrap();
parse_str(
"
var t: texture_multisampled_2d_array<i32>;
fn foo() {
const r: vec4<i32> = textureLoad(t, vec2<i32>(10, 20), 2, 3);
}
",
)
.unwrap();
parse_str(
"
var t: [[access(read)]] texture_storage_1d_array<r32float>;
fn foo() {
const r: vec4<f32> = textureLoad(t, 10, 2);
}
",
)
.unwrap();
}