From c8ee8e07f7cc8f18d367ffcec065b45f8a6976f4 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 5 Aug 2010 15:29:24 -0700 Subject: glsl2: Set a flag when visiting the assignee of an assignment --- src/glsl/ir_rvalue_visitor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/glsl/ir_rvalue_visitor.cpp') diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/glsl/ir_rvalue_visitor.cpp index 613b07c302..773bfcfa3e 100644 --- a/src/glsl/ir_rvalue_visitor.cpp +++ b/src/glsl/ir_rvalue_visitor.cpp @@ -83,7 +83,14 @@ ir_rvalue_visitor::visit_leave(ir_swizzle *ir) ir_visitor_status ir_rvalue_visitor::visit_leave(ir_dereference_array *ir) { + /* The array index is not the target of the assignment, so clear the + * 'in_assignee' flag. Restore it after returning from the array index. + */ + const bool was_in_assignee = this->in_assignee; + this->in_assignee = false; handle_rvalue(&ir->array_index); + this->in_assignee = was_in_assignee; + handle_rvalue(&ir->array); return visit_continue; } -- cgit v1.2.3