From 8d5f3cef795428d7a95120416122a39c10cff11c Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 18 Jul 2011 09:51:34 -0700 Subject: [PATCH] glsl: Move is_array_or_matrix outside visitor class There's no reason for it to be there, and another class that may not have access to the visitor will need it soon. Reviewed-by: Eric Anholt --- src/glsl/lower_variable_index_to_cond_assign.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/glsl/lower_variable_index_to_cond_assign.cpp index 8eb1612f0a0..45adb267f2c 100644 --- a/src/glsl/lower_variable_index_to_cond_assign.cpp +++ b/src/glsl/lower_variable_index_to_cond_assign.cpp @@ -37,6 +37,12 @@ #include "glsl_types.h" #include "main/macros.h" +static inline bool +is_array_or_matrix(const ir_instruction *ir) +{ + return (ir->type->is_array() || ir->type->is_matrix()); +} + struct assignment_generator { ir_instruction* base_ir; @@ -233,11 +239,6 @@ public: bool lower_temps; bool lower_uniforms; - bool is_array_or_matrix(const ir_instruction *ir) const - { - return (ir->type->is_array() || ir->type->is_matrix()); - } - bool needs_lowering(ir_dereference_array *deref) const { if (deref == NULL || deref->array_index->as_constant() -- 2.30.2