diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-11-23 09:51:52 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-01-13 11:38:19 -0800 |
| commit | 8050584096eec50570bfc0c81926050f27a5dfe5 (patch) | |
| tree | 0000afe81322fe695bea4d8842fdf76cb9a39de4 /src/glsl/opt_function_inlining.cpp | |
| parent | 2e113dfab8c7068e083960fcf0b93418c3d79fa3 (diff) | |
| download | external_mesa3d-8050584096eec50570bfc0c81926050f27a5dfe5.zip external_mesa3d-8050584096eec50570bfc0c81926050f27a5dfe5.tar.gz external_mesa3d-8050584096eec50570bfc0c81926050f27a5dfe5.tar.bz2 | |
glsl: Cast ir_call parameters to ir_rvalue, not ir_instruction.
A function call's parameters are always rvalues. ir_rvalue may not
always be a subclass of ir_instruction in the future, so we should use
the right one.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/opt_function_inlining.cpp')
| -rw-r--r-- | src/glsl/opt_function_inlining.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/opt_function_inlining.cpp b/src/glsl/opt_function_inlining.cpp index 2ae18c1..a140ed3 100644 --- a/src/glsl/opt_function_inlining.cpp +++ b/src/glsl/opt_function_inlining.cpp @@ -175,7 +175,7 @@ ir_call::generate_inline(ir_instruction *next_ir) 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(); + ir_rvalue *const param = (ir_rvalue *) param_iter.get(); ir_variable *sig_param = (ir_variable *) sig_param_iter.get(); if (sig_param->type->contains_opaque()) { @@ -198,7 +198,7 @@ ir_call::generate_inline(ir_instruction *next_ir) 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(); + ir_rvalue *const param = (ir_rvalue *) 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. */ |