Mesa (glsl2): glsl2: Fix handling of out values in function inlining.
Eric Anholt
anholt at kemper.freedesktop.org
Tue Jul 20 23:21:35 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 325a49701fbee14a99a02c69872a1d7577a633cf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=325a49701fbee14a99a02c69872a1d7577a633cf
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jul 20 16:03:46 2010 -0700
glsl2: Fix handling of out values in function inlining.
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
---
src/glsl/ir_function_inlining.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index 8c545aa..a3f7089 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -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;
More information about the mesa-commit
mailing list