summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-07-07 11:57:16 -0700
committerIan Romanick <[email protected]>2010-07-07 12:41:26 -0700
commit2e85f993d8a014b53ad2f6d295cf66d3fb38b091 (patch)
treee54d794a2271ed67faaad5eada3e26f9e8e590d0
parent76101f7c0468c7f346b1a8d6b824fc8914a17bd1 (diff)
Revert "glsl2: Put the declaration in the instruction stream before its initializer."
This change causes segfaults in other tests. A fix for both sets of segfaults is coming. This reverts commit d4d630b72c7b7f38074addda0f1b819608247d93.
-rw-r--r--src/glsl/ast_to_hir.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 3de754fa818..f5e93b02547 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1772,8 +1772,6 @@ ast_declarator_list::hir(exec_list *instructions,
}
}
- instructions->push_tail(var);
-
if (decl->initializer != NULL) {
YYLTYPE initializer_loc = decl->initializer->get_location();
@@ -1920,6 +1918,8 @@ ast_declarator_list::hir(exec_list *instructions,
decl->identifier);
}
+ instructions->push_tail(var);
+
/* Add the variable to the symbol table after processing the initializer.
* This differs from most C-like languages, but it follows the GLSL
* specification. From page 28 (page 34 of the PDF) of the GLSL 1.50