Merge pull request #143 from tfoleyNV/fixup-for-glslang-bug-fixup

Fixup for the glslang bug workaround
shader-slang · Jul 24, 2017 · 29fb1d7 · 29fb1d7
2 parents 1d4633f + e7241a9
commit 29fb1d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/source/slang/lower.cpp b/source/slang/lower.cpp
@@ -3006,8 +3006,16 @@ return loweredExpr;
         }
 
         RefPtr<VarDeclBase> loweredDecl = loweredDeclClass.createInstance();
+
+        // Note: we lower the declaration (including its initialization expression, if any)
+        // *before* we add the declaration to the current context (e.g., a statement being
+        // built), so that any operations inside the initialization expression that
+        // might need to inject statements/temporaries/whatever happen *before*
+        // the declaration of this variable.
+        auto result = lowerSimpleVarDeclCommon(loweredDecl, decl, loweredType);
         addDecl(loweredDecl);
-        return lowerSimpleVarDeclCommon(loweredDecl, decl, loweredType);
+
+        return result;
     }
 
     RefPtr<VarDeclBase> lowerVarDeclCommon(

diff --git a/tests/rewriter/glslang-bug-988-workaround.frag b/tests/rewriter/glslang-bug-988-workaround.frag
@@ -25,7 +25,8 @@ out vec4 result;
 
 void main()
 {
-	result = doIt(foo);
+	vec4 r = doIt(foo);
+	result = r;
 }
 
 #else
@@ -52,7 +53,8 @@ out vec4 result;
 void main()
 {
 	Foo SLANG_tmp_0 = foo;
-	result = doIt(SLANG_tmp_0);
+	vec4 r = doIt(SLANG_tmp_0);
+	result = r;
 }
 
 #endif