[glsl-in] Support commas in structure definitions

Fixes #2384.
gfx-rs · Jul 7, 2023 · 07aa64a · 07aa64a
1 parent 7624d6c
commit 07aa64a
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 21 deletions.
diff --git a/src/front/glsl/parser/declarations.rs b/src/front/glsl/parser/declarations.rs
@@ -629,34 +629,49 @@ impl<'source> ParsingContext<'source> {
             // TODO: type_qualifier
 
             let (mut ty, mut meta) = self.parse_type_non_void(frontend)?;
-            let (name, end_meta) = self.expect_ident(frontend)?;
+            let (name, mut end_meta) = self.expect_ident(frontend)?;
+
+            let mut names = vec![name];
+            while let Some(&Token {
+                value: TokenValue::Comma,
+                ..
+            }) = self.peek(frontend)
+            {
+                self.bump(frontend)?;
+
+                let (next_name, next_end_meta) = self.expect_ident(frontend)?;
+                names.push(next_name);
+                end_meta = next_end_meta;
+            }
 
             meta.subsume(end_meta);
 
             self.parse_array_specifier(frontend, &mut meta, &mut ty)?;
 
             self.expect(frontend, TokenValue::Semicolon)?;
 
-            let info = offset::calculate_offset(
-                ty,
-                meta,
-                layout,
-                &mut frontend.module.types,
-                &mut frontend.errors,
-            );
-
-            let member_alignment = info.align;
-            span = member_alignment.round_up(span);
-            align = member_alignment.max(align);
-
-            members.push(StructMember {
-                name: Some(name),
-                ty: info.ty,
-                binding: None,
-                offset: span,
-            });
-
-            span += info.span;
+            for name in names {
+                let info = offset::calculate_offset(
+                    ty,
+                    meta,
+                    layout,
+                    &mut frontend.module.types,
+                    &mut frontend.errors,
+                );
+
+                let member_alignment = info.align;
+                span = member_alignment.round_up(span);
+                align = member_alignment.max(align);
+
+                members.push(StructMember {
+                    name: Some(name),
+                    ty: info.ty,
+                    binding: None,
+                    offset: span,
+                });
+
+                span += info.span;
+            }
 
             if let TokenValue::RightBrace = self.expect_peek(frontend)?.value {
                 break;

diff --git a/src/front/glsl/parser_tests.rs b/src/front/glsl/parser_tests.rs
@@ -731,6 +731,19 @@ fn structs() {
         "#,
         )
         .unwrap_err();
+
+    frontend
+        .parse(
+            &Options::from(ShaderStage::Vertex),
+            r#"
+        struct LightScatteringParams {
+            float BetaRay, BetaMie, HGg, DistanceMul, BlendCoeff;
+            vec3 SunDirection, SunColor;
+        };
+        void main() {}
+        "#,
+        )
+        .unwrap();
 }
 
 #[test]

diff --git a/tests/in/glsl/struct-member-list.vert b/tests/in/glsl/struct-member-list.vert
@@ -0,0 +1,9 @@
+struct LightScatteringParams {
+    float BetaRay, BetaMie, HGg, DistanceMul, BlendCoeff;
+    vec3 SunDirection, SunColor;
+};
+
+void main() {
+   gl_Position = vec4(1.0, 1.0, 1.0, 1.0);
+}
+
diff --git a/tests/out/wgsl/struct-member-list-vert.wgsl b/tests/out/wgsl/struct-member-list-vert.wgsl
@@ -0,0 +1,27 @@
+struct LightScatteringParams {
+    BetaRay: f32,
+    BetaMie: f32,
+    HGg: f32,
+    DistanceMul: f32,
+    BlendCoeff: f32,
+    SunDirection: vec3<f32>,
+    SunColor: vec3<f32>,
+}
+
+struct VertexOutput {
+    @builtin(position) member: vec4<f32>,
+}
+
+var<private> gl_Position: vec4<f32>;
+
+fn main_1() {
+    gl_Position = vec4<f32>(1.0, 1.0, 1.0, 1.0);
+    return;
+}
+
+@vertex 
+fn main() -> VertexOutput {
+    main_1();
+    let _e1 = gl_Position;
+    return VertexOutput(_e1);
+}