fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: Put the initializer in the instruction stream after the declaration

Browse source
This commit is contained in:
Ian Romanick 2010-07-07 12:13:34 -07:00
parent c44556317a
commit e78e0fa42b
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/glsl/ast_to_hir.cpp
View file

@ -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