From: Eric Anholt <eric@anholt.net>
Date: Thu, 5 Aug 2010 21:41:09 +0000 (-0700)
Subject: glsl2: Insert global declarations at the top of the instruction stream.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8048226b7b1bbe8fd89f9c32fa4fadca4b8760c4;p=mesa.git

glsl2: Insert global declarations at the top of the instruction stream.

Fixes use-before-decl in glslparsertest shaders.

Fixes:
CorrectFull.frag
CorrectModule.frag
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 292c7be6217..f14341c8f72 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1951,7 +1951,14 @@ ast_declarator_list::hir(exec_list *instructions,
 			  decl->identifier);
       }
 
-      instructions->push_tail(var);
+      /* Push the variable declaration to the top.  It means that all
+       * the variable declarations will appear in a funny
+       * last-to-first order, but otherwise we run into trouble if a
+       * function is prototyped, a global var is decled, then the
+       * function is defined with usage of the global var.  See
+       * glslparsertest's CorrectModule.frag.
+       */
+      instructions->push_head(var);
       instructions->append_list(&initializer_instructions);
 
       /* Add the variable to the symbol table after processing the initializer.