Mesa (glsl2): Revert "glsl2: Put the declaration in the instruction stream before its initializer."
Ian Romanick
idr at kemper.freedesktop.org
Wed Jul 7 19:45:33 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 2e85f993d8a014b53ad2f6d295cf66d3fb38b091
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e85f993d8a014b53ad2f6d295cf66d3fb38b091
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Jul 7 11:57:16 2010 -0700
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.
---
src/glsl/ast_to_hir.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 3de754f..f5e93b0 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
More information about the mesa-commit
mailing list