[wgsl-in] Uses commas to separate struct members instead of semicolons

gfx-rs · Mar 13, 2022 · 816fa34 · 816fa34
1 parent 7f4c017
commit 816fa34
Show file tree

Hide file tree

Showing 20 changed files with 112 additions and 106 deletions.
diff --git a/src/front/wgsl/mod.rs b/src/front/wgsl/mod.rs
@@ -2811,7 +2811,14 @@ impl Parser {
         let mut members = Vec::new();
 
         lexer.expect(Token::Paren('{'))?;
-        loop {
+        let mut ready = true;
+        while !lexer.skip(Token::Paren('}')) {
+            if !ready {
+                return Err(Error::Unexpected(
+                    lexer.next(),
+                    ExpectedToken::Token(Token::Separator(',')),
+                ));
+            }
             let (mut size, mut align) = (None, None);
             self.push_scope(Scope::Attribute, lexer);
             let mut bind_parser = BindingParser::default();
@@ -2838,18 +2845,14 @@ impl Parser {
             let bind_span = self.pop_scope(lexer);
             let (name, span) = match lexer.next() {
                 (Token::Word(word), span) => (word, span),
-                (Token::Paren('}'), _) => {
-                    let span = Layouter::round_up(alignment, offset);
-                    return Ok((members, span));
-                }
                 other => return Err(Error::Unexpected(other, ExpectedToken::FieldName)),
             };
             if crate::keywords::wgsl::RESERVED.contains(&name) {
                 return Err(Error::ReservedKeyword(span));
             }
             lexer.expect(Token::Separator(':'))?;
             let (ty, _access) = self.parse_type_decl(lexer, None, type_arena, const_arena)?;
-            lexer.expect(Token::Separator(';'))?;
+            ready = lexer.skip(Token::Separator(','));
 
             self.layouter.update(type_arena, const_arena).unwrap();
 
@@ -2868,6 +2871,9 @@ impl Parser {
                 offset: range.start,
             });
         }
+
+        let span = Layouter::round_up(alignment, offset);
+        Ok((members, span))
     }
 
     fn parse_type_decl_impl<'a>(

diff --git a/src/front/wgsl/tests.rs b/src/front/wgsl/tests.rs
@@ -157,11 +157,11 @@ fn parse_type_cast() {
 fn parse_struct() {
     parse_str(
         "
-        struct Foo { x: i32; };
+        struct Foo { x: i32 };
         struct Bar {
-            @size(16) x: vec2<i32>;
-            @align(16) y: f32;
-            @size(32) @align(8) z: vec3<f32>;
+            @size(16) x: vec2<i32>,
+            @align(16) y: f32,
+            @size(32) @align(8) z: vec3<f32>,
         };
         struct Empty {};
         var<storage,read_write> s: Foo;
@@ -415,8 +415,8 @@ fn parse_struct_instantiation() {
     parse_str(
         "
     struct Foo {
-        a: f32;
-        b: vec3<f32>;
+        a: f32,
+        b: vec3<f32>,
     };
     
     @stage(fragment)
@@ -433,7 +433,7 @@ fn parse_array_length() {
     parse_str(
         "
         struct Foo {
-            data: array<u32>;
+            data: array<u32>
         }; // this is used as both input and output for convenience
 
         @group(0) @binding(0)

diff --git a/tests/in/access.wgsl b/tests/in/access.wgsl
@@ -1,15 +1,15 @@
 // This snapshot tests accessing various containers, dereferencing pointers.
 
 struct AlignedWrapper {
-	@align(8) value: i32;
+	@align(8) value: i32
 };
 
 struct Bar {
-	matrix: mat4x4<f32>;
-	matrix_array: array<mat2x2<f32>, 2>;
-	atom: atomic<i32>;
-	arr: array<vec2<u32>, 2>;
-	data: array<AlignedWrapper>;
+	matrix: mat4x4<f32>,
+	matrix_array: array<mat2x2<f32>, 2>,
+	atom: atomic<i32>,
+	arr: array<vec2<u32>, 2>,
+	data: array<AlignedWrapper>,
 };
 
 @group(0) @binding(0)

diff --git a/tests/in/boids.wgsl b/tests/in/boids.wgsl
@@ -1,22 +1,22 @@
 let NUM_PARTICLES: u32 = 1500u;
 
 struct Particle {
-  pos : vec2<f32>;
-  vel : vec2<f32>;
+  pos : vec2<f32>,
+  vel : vec2<f32>,
 };
 
 struct SimParams {
-  deltaT : f32;
-  rule1Distance : f32;
-  rule2Distance : f32;
-  rule3Distance : f32;
-  rule1Scale : f32;
-  rule2Scale : f32;
-  rule3Scale : f32;
+  deltaT : f32,
+  rule1Distance : f32,
+  rule2Distance : f32,
+  rule3Distance : f32,
+  rule1Scale : f32,
+  rule2Scale : f32,
+  rule3Scale : f32,
 };
 
 struct Particles {
-  particles : array<Particle>;
+  particles : array<Particle>
 };
 
 @group(0) @binding(0) var<uniform> params : SimParams;

diff --git a/tests/in/bounds-check-restrict.wgsl b/tests/in/bounds-check-restrict.wgsl
@@ -1,10 +1,10 @@
 // Tests for `naga::back::BoundsCheckPolicy::Restrict`.
 
 struct Globals {
-    a: array<f32, 10>;
-    v: vec4<f32>;
-    m: mat3x4<f32>;
-    d: array<f32>;
+    a: array<f32, 10>,
+    v: vec4<f32>,
+    m: mat3x4<f32>,
+    d: array<f32>,
 };
 
 @group(0) @binding(0) var<storage, read_write> globals: Globals;

diff --git a/tests/in/bounds-check-zero-atomic.wgsl b/tests/in/bounds-check-zero-atomic.wgsl
@@ -5,9 +5,9 @@
 // be combined.
 
 struct Globals {
-    a: atomic<u32>;
-    b: array<atomic<u32>, 10>;
-    c: array<atomic<u32>>;
+    a: atomic<u32>,
+    b: array<atomic<u32>, 10>,
+    c: array<atomic<u32>>,
 };
 
 @group(0) @binding(0) var<storage, read_write> globals: Globals;

diff --git a/tests/in/bounds-check-zero.wgsl b/tests/in/bounds-check-zero.wgsl
@@ -1,10 +1,10 @@
 // Tests for `naga::back::BoundsCheckPolicy::ReadZeroSkipWrite`.
 
 struct Globals {
-    a: array<f32, 10>;
-    v: vec4<f32>;
-    m: mat3x4<f32>;
-    d: array<f32>;
+    a: array<f32, 10>,
+    v: vec4<f32>,
+    m: mat3x4<f32>,
+    d: array<f32>,
 };
 
 @group(0) @binding(0) var<storage, read_write> globals: Globals;

diff --git a/tests/in/collatz.wgsl b/tests/in/collatz.wgsl
@@ -1,5 +1,5 @@
 struct PrimeIndices {
-    data: array<u32>;
+    data: array<u32>
 }; // this is used as both input and output for convenience
 
 @group(0) @binding(0)

diff --git a/tests/in/extra.wgsl b/tests/in/extra.wgsl
@@ -1,12 +1,12 @@
 struct PushConstants {
-    index: u32;
-    double: vec2<f64>;
+    index: u32,
+    double: vec2<f64>,
 };
 var<push_constant> pc: PushConstants;
 
 struct FragmentIn {
-    @location(0) color: vec4<f32>;
-    @builtin(primitive_index) primitive_index: u32;
+    @location(0) color: vec4<f32>,
+    @builtin(primitive_index) primitive_index: u32,
 };
 
 @stage(fragment)

diff --git a/tests/in/globals.wgsl b/tests/in/globals.wgsl
@@ -6,9 +6,9 @@ var<workgroup> wg : array<f32, 10u>;
 var<workgroup> at: atomic<u32>;
 
 struct Foo {
-    v3: vec3<f32>;
+    v3: vec3<f32>,
     // test packed vec3
-    v1: f32;
+    v1: f32,
 };
 @group(0) @binding(1)
 var<storage, read_write> alignment: Foo;

diff --git a/tests/in/interface.wgsl b/tests/in/interface.wgsl
@@ -1,8 +1,8 @@
 // Testing various parts of the pipeline interface: locations, built-ins, and entry points
 
 struct VertexOutput {
-    @builtin(position) position: vec4<f32>;
-    @location(1) varying: f32;
+    @builtin(position) position: vec4<f32>,
+    @location(1) varying: f32,
 };
 
 @stage(vertex)
@@ -16,9 +16,9 @@ fn vertex(
 }
 
 struct FragmentOutput {
-    @builtin(frag_depth) depth: f32;
-    @builtin(sample_mask) sample_mask: u32;
-    @location(0) color: f32;
+    @builtin(frag_depth) depth: f32,
+    @builtin(sample_mask) sample_mask: u32,
+    @location(0) color: f32,
 };
 
 @stage(fragment)
@@ -47,11 +47,11 @@ fn compute(
 }
 
 struct Input1 {
-    @builtin(vertex_index) index: u32;
+    @builtin(vertex_index) index: u32,
 };
 
 struct Input2 {
-    @builtin(instance_index) index: u32;
+    @builtin(instance_index) index: u32,
 };
 
 @stage(vertex)

diff --git a/tests/in/interpolate.wgsl b/tests/in/interpolate.wgsl
@@ -1,14 +1,14 @@
 //TODO: merge with "interface"?
 
 struct FragmentInput {
-  @builtin(position) position: vec4<f32>;
-  @location(0) @interpolate(flat) flat : u32;
-  @location(1) @interpolate(linear) linear : f32;
-  @location(2) @interpolate(linear, centroid) linear_centroid : vec2<f32>;
-  @location(3) @interpolate(linear, sample) linear_sample : vec3<f32>;
-  @location(4) @interpolate(perspective) perspective : vec4<f32>;
-  @location(5) @interpolate(perspective, centroid) perspective_centroid : f32;
-  @location(6) @interpolate(perspective, sample) perspective_sample : f32;
+  @builtin(position) position: vec4<f32>,
+  @location(0) @interpolate(flat) flat : u32,
+  @location(1) @interpolate(linear) linear : f32,
+  @location(2) @interpolate(linear, centroid) linear_centroid : vec2<f32>,
+  @location(3) @interpolate(linear, sample) linear_sample : vec3<f32>,
+  @location(4) @interpolate(perspective) perspective : vec4<f32>,
+  @location(5) @interpolate(perspective, centroid) perspective_centroid : f32,
+  @location(6) @interpolate(perspective, sample) perspective_sample : f32,
 };
 
 @stage(vertex)

diff --git a/tests/in/operators.wgsl b/tests/in/operators.wgsl
@@ -39,8 +39,8 @@ fn bool_cast(x: vec3<f32>) -> vec3<f32> {
 }
 
 struct Foo {
-    a: vec4<f32>;
-    b: i32;
+    a: vec4<f32>,
+    b: i32,
 };
 
 fn constructors() -> f32 {

diff --git a/tests/in/pointers.wgsl b/tests/in/pointers.wgsl
@@ -5,7 +5,7 @@ fn f() {
 }
 
 struct DynamicArray {
-    arr: array<u32>;
+    arr: array<u32>
 };
 
 @group(0) @binding(0)

diff --git a/tests/in/policy-mix.wgsl b/tests/in/policy-mix.wgsl
@@ -3,12 +3,12 @@
 
 // Storage and Uniform storage classes
 struct InStorage {
-  a: array<vec4<f32>, 10>;
+  a: array<vec4<f32>, 10>
 };
 @group(0) @binding(0) var<storage> in_storage: InStorage;
 
 struct InUniform {
-  a: array<vec4<f32>, 20>;
+  a: array<vec4<f32>, 20>
 };
 @group(0) @binding(1) var<uniform> in_uniform: InUniform;
 

diff --git a/tests/in/push-constants.wgsl b/tests/in/push-constants.wgsl
@@ -1,10 +1,10 @@
 struct PushConstants {
-    multiplier: f32;
+    multiplier: f32
 };
 var<push_constant> pc: PushConstants;
 
 struct FragmentIn {
-    @location(0) color: vec4<f32>;
+    @location(0) color: vec4<f32>
 };
 
 @stage(fragment)

diff --git a/tests/in/quad.wgsl b/tests/in/quad.wgsl
@@ -2,8 +2,8 @@
 let c_scale: f32 = 1.2;
 
 struct VertexOutput {
-  @location(0) uv : vec2<f32>;
-  @builtin(position) position : vec4<f32>;
+  @location(0) uv : vec2<f32>,
+  @builtin(position) position : vec4<f32>,
 };
 
 @stage(vertex)

diff --git a/tests/in/shadow.wgsl b/tests/in/shadow.wgsl
@@ -1,15 +1,15 @@
 struct Globals {
-    view_proj: mat4x4<f32>;
-    num_lights: vec4<u32>;
+    view_proj: mat4x4<f32>,
+    num_lights: vec4<u32>,
 };
 
 @group(0)
 @binding(0)
 var<uniform> u_globals: Globals;
 
 struct Entity {
-    world: mat4x4<f32>;
-    color: vec4<f32>;
+    world: mat4x4<f32>,
+    color: vec4<f32>,
 };
 
 @group(1)
@@ -24,9 +24,9 @@ fn vs_bake(@location(0) position: vec4<i32>) -> @builtin(position) vec4<f32> {
 */
 
 struct VertexOutput {
-    @builtin(position) proj_position: vec4<f32>;
-    @location(0) world_normal: vec3<f32>;
-    @location(1) world_position: vec4<f32>;
+    @builtin(position) proj_position: vec4<f32>,
+    @location(0) world_normal: vec3<f32>,
+    @location(1) world_position: vec4<f32>,
 };
 
 @stage(vertex)
@@ -46,9 +46,9 @@ fn vs_main(
 // fragment shader
 
 struct Light {
-    proj: mat4x4<f32>;
-    pos: vec4<f32>;
-    color: vec4<f32>;
+    proj: mat4x4<f32>,
+    pos: vec4<f32>,
+    color: vec4<f32>,
 };
 
 @group(0)

diff --git a/tests/in/skybox.wgsl b/tests/in/skybox.wgsl
@@ -1,11 +1,11 @@
 struct VertexOutput {
-    @builtin(position) position: vec4<f32>;
-    @location(0) uv: vec3<f32>;
+    @builtin(position) position: vec4<f32>,
+    @location(0) uv: vec3<f32>,
 };
 
 struct Data {
-    proj_inv: mat4x4<f32>;
-    view: mat4x4<f32>;
+    proj_inv: mat4x4<f32>,
+    view: mat4x4<f32>,
 };
 @group(0) @binding(0)
 var<uniform> r_data: Data;