From 6652af36fe8994b1621d882fcc230d320908a2a3 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 9 Mar 2010 16:38:02 -0800 Subject: Add assignment side-effect to the instruction stream The actual assignment is a side-effect of the assignment expression. Add it to the instruction stream and return the LHS of the assignment as its rvalue. --- ast_to_hir.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ast_to_hir.cpp') diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 5811d73586..faa13abd59 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -398,7 +398,7 @@ ast_expression::hir(exec_list *instructions, make_empty_list(& op_list); switch (this->oper) { - case ast_assign: + case ast_assign: { op[0] = this->subexpressions[0]->hir(instructions, state); op[1] = this->subexpressions[1]->hir(instructions, state); @@ -437,8 +437,12 @@ ast_expression::hir(exec_list *instructions, /* FINISHME: Check that the LHS and RHS have matching types. */ /* FINISHME: For GLSL 1.10, check that the types are not arrays. */ - result = new ir_assignment(op[0], op[1], NULL); + ir_instruction *tmp = new ir_assignment(op[0], op[1], NULL); + instructions->push_tail(tmp); + + result = op[0]; break; + } case ast_plus: op[0] = this->subexpressions[0]->hir(instructions, state); -- cgit v1.2.3