From c6f80401dc533b04341afe8d596960d1bc25efce Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 Apr 2012 10:49:59 +0200 Subject: fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 --- mesalib/src/glsl/opt_tree_grafting.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesalib/src/glsl/opt_tree_grafting.cpp') diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp index e2aff5f80..d86eab80e 100644 --- a/mesalib/src/glsl/opt_tree_grafting.cpp +++ b/mesalib/src/glsl/opt_tree_grafting.cpp @@ -202,7 +202,7 @@ ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir) ir_visitor_status ir_tree_grafting_visitor::visit_enter(ir_call *ir) { - exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator(); + exec_list_iterator sig_iter = ir->callee->parameters.iterator(); /* Reminder: iterating ir_call iterates its parameters. */ foreach_iter(exec_list_iterator, iter, *ir) { ir_variable *sig_param = (ir_variable *)sig_iter.get(); @@ -222,6 +222,9 @@ ir_tree_grafting_visitor::visit_enter(ir_call *ir) sig_iter.next(); } + if (ir->return_deref && check_graft(ir, ir->return_deref->var) == visit_stop) + return visit_stop; + return visit_continue; } -- cgit v1.2.3