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

glsl2: Fix handling of out values in function inlining.

Browse source 
The parameters[i] is our inlined variables representing the
parameters, so they are always ir_var_auto.  Walk the signature params
in handling "out" values like we do for "in" values to find the mode.

Fixes (with the previous 2 commits):
glsl1-function call with in, out params
glsl1-function call with inout params
This commit is contained in:
Eric Anholt 2010-07-20 16:03:46 -07:00
parent 2927c81ed1
commit 325a49701f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/ir_function_inlining.cpp
View file

@ -169,21 +169,24 @@ ir_call::generate_inline(ir_instruction *next_ir)
*/
i = 0;
param_iter = this->actual_parameters.iterator();
sig_param_iter = this->callee->parameters.iterator();
for (i = 0; i < num_parameters; i++) {
ir_instruction *const param = (ir_instruction *) param_iter.get();
const ir_variable *const sig_param = (ir_variable *) sig_param_iter.get();
/* Move our param variable into the actual param if it's an 'out' type. */
if (parameters[i]->mode == ir_var_out ||
parameters[i]->mode == ir_var_inout) {
if (sig_param->mode == ir_var_out ||
sig_param->mode == ir_var_inout) {
ir_assignment *assign;
assign = new(ctx) ir_assignment(param->as_rvalue(),
assign = new(ctx) ir_assignment(param->clone(NULL)->as_rvalue(),
new(ctx) ir_dereference_variable(parameters[i]),
NULL);
next_ir->insert_before(assign);
}
param_iter.next();
sig_param_iter.next();
}
delete [] parameters;