[wgsl-in] Always flush expressions in function call (#1478)

gfx-rs · Oct 25, 2021 · 8c071ef · 8c071ef
1 parent f8d3c4b
commit 8c071ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/validation-linux.yml b/.github/workflows/validation-linux.yml
@@ -6,6 +6,7 @@ on:
     - 'tests/out/glsl/*.glsl'
     - 'tests/out/dot/*.dot'
     - 'tests/out/wgsl/*.wgsl'
+    - 'src/front/wgsl/*'
 
 jobs:
   validate-linux:

diff --git a/src/front/wgsl/mod.rs b/src/front/wgsl/mod.rs
@@ -1891,12 +1891,12 @@ impl Parser {
                         match self.parse_local_function_call(lexer, name, ctx.reborrow())? {
                             Some((function, arguments)) => {
                                 let span = NagaSpan::from(self.peek_scope(lexer));
+                                ctx.block.extend(ctx.emitter.finish(ctx.expressions));
                                 let result = ctx.functions[function].result.as_ref().map(|_| {
-                                    ctx.interrupt_emitter(
-                                        crate::Expression::CallResult(function),
-                                        span,
-                                    )
+                                    ctx.expressions
+                                        .append(crate::Expression::CallResult(function), span)
                                 });
+                                ctx.emitter.start(ctx.expressions);
                                 ctx.block.push(
                                     crate::Statement::Call {
                                         function,