encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-18 01:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgsl: Separate struct members with commas

Browse Source 
Use of semicolons is still supported, but deprecated.

Also updates the parsing methods for structures to better match the
WGSL grammar.

Bug: tint:1475
Change-Id: I7675ba42c13f91080b0ac173c352e0092021f80b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/84380
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: James Price <jrprice@google.com>
This commit is contained in:
James Price
2022-03-28 14:31:22 +00:00
committed by Tint LUCI CQ
parent 444e051faa
commit 3b671cb377
984 changed files with 4995 additions and 5027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/tint/buffer/uniform/static_index/read.wgsl
View File

@@ -1,20 +1,20 @@
struct Inner {
@size(16) x : i32;
@size(16) x : i32,
};
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : vec2<i32>;
h : vec2<i32>;
i : mat2x3<f32>;
j : mat3x2<f32>;
@align(16) k : Inner;
@align(16) l : array<Inner, 4>;
a : vec3<i32>,
b : i32,
c : vec3<u32>,
d : u32,
e : vec3<f32>,
f : f32,
g : vec2<i32>,
h : vec2<i32>,
i : mat2x3<f32>,
j : mat3x2<f32>,
@align(16) k : Inner,
@align(16) l : array<Inner, 4>,
};
@binding(0) @group(0) var<uniform> s : S;

26
test/tint/buffer/uniform/static_index/read.wgsl.expected.wgsl
View File

@@ -1,23 +1,23 @@
struct Inner {
@size(16)
x : i32;
x : i32,
}
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : vec2<i32>;
h : vec2<i32>;
i : mat2x3<f32>;
j : mat3x2<f32>;
a : vec3<i32>,
b : i32,
c : vec3<u32>,
d : u32,
e : vec3<f32>,
f : f32,
g : vec2<i32>,
h : vec2<i32>,
i : mat2x3<f32>,
j : mat3x2<f32>,
@align(16)
k : Inner;
k : Inner,
@align(16)
l : array<Inner, 4>;
l : array<Inner, 4>,
}
@binding(0) @group(0) var<uniform> s : S;