Mesa (glsl2): glsl2: Put the initializer in the instruction stream after the declaration
Ian Romanick
idr at kemper.freedesktop.org
Wed Jul 7 19:45:33 UTC 2010
Module: Mesa
Branch: glsl2
Commit: e78e0fa42b49b50ed1150f7fdb74bf942ebd6bcf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e78e0fa42b49b50ed1150f7fdb74bf942ebd6bcf
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Jul 7 12:13:34 2010 -0700
glsl2: Put the initializer in the instruction stream after the declaration
---
src/glsl/ast_to_hir.cpp | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index f5e93b0..b21131f 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1772,6 +1772,13 @@ ast_declarator_list::hir(exec_list *instructions,
}
}
+ /* Process the initializer and add its instructions to a temporary
+ * list. This list will be added to the instruction stream (below) after
+ * the declaration is added. This is done because in some cases (such as
+ * redeclarations) the declaration may not actually be added to the
+ * instruction stream.
+ */
+ exec_list intializer_instructions;
if (decl->initializer != NULL) {
YYLTYPE initializer_loc = decl->initializer->get_location();
@@ -1801,7 +1808,8 @@ ast_declarator_list::hir(exec_list *instructions,
}
ir_dereference *const lhs = new(ctx) ir_dereference_variable(var);
- ir_rvalue *rhs = decl->initializer->hir(instructions, state);
+ ir_rvalue *rhs = decl->initializer->hir(&intializer_instructions,
+ state);
/* Calculate the constant value if this is a const or uniform
* declaration.
@@ -1829,7 +1837,7 @@ ast_declarator_list::hir(exec_list *instructions,
/* Never emit code to initialize a uniform.
*/
if (!this->type->qualifier.uniform)
- result = do_assignment(instructions, state, lhs, rhs,
+ result = do_assignment(&intializer_instructions, state, lhs, rhs,
this->get_location());
var->read_only = temp;
}
@@ -1919,6 +1927,7 @@ ast_declarator_list::hir(exec_list *instructions,
}
instructions->push_tail(var);
+ instructions->append_list(&intializer_instructions);
/* Add the variable to the symbol table after processing the initializer.
* This differs from most C-like languages, but it follows the GLSL
More information about the mesa-commit
mailing list