diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2011-09-20 17:58:45 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-04-02 14:15:46 -0700 |
| commit | f75c2d53146ea14f8dfedcc5b7a4704278ba0792 (patch) | |
| tree | 512d5cda78998a6b5b80d3f6ec90ba92dcb47b8c /src/glsl/lower_variable_index_to_cond_assign.cpp | |
| parent | 82065fa20ee3f2880a070f1f4f75509b910cedde (diff) | |
| download | external_mesa3d-f75c2d53146ea14f8dfedcc5b7a4704278ba0792.zip external_mesa3d-f75c2d53146ea14f8dfedcc5b7a4704278ba0792.tar.gz external_mesa3d-f75c2d53146ea14f8dfedcc5b7a4704278ba0792.tar.bz2 | |
glsl: Demote 'type' from ir_instruction to ir_rvalue and ir_variable.
Variables have types, expression trees have types, but statements don't.
Rather than have a nonsensical field that stays NULL in the base class,
just move it to where it makes sense.
Fix up a few places that lazily used ir_instruction even though they
actually knew the particular subclass.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/lower_variable_index_to_cond_assign.cpp')
| -rw-r--r-- | src/glsl/lower_variable_index_to_cond_assign.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/glsl/lower_variable_index_to_cond_assign.cpp index f8e4a1d..5777107 100644 --- a/src/glsl/lower_variable_index_to_cond_assign.cpp +++ b/src/glsl/lower_variable_index_to_cond_assign.cpp @@ -117,7 +117,7 @@ compare_index_block(exec_list *instructions, ir_variable *index, } static inline bool -is_array_or_matrix(const ir_instruction *ir) +is_array_or_matrix(const ir_rvalue *ir) { return (ir->type->is_array() || ir->type->is_matrix()); } |