From 115fd75ab06b858b83173f7d76eada8ea417fc86 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 28 Nov 2013 12:17:54 -0800 Subject: [PATCH] glsl/loops: Remove unused fields iv_scale and biv from loop_variable class. These fields were part of some planned optimizations that never materialized. Remove them for now to simplify things; if we ever get round to adding the optimizations that would require them, we can always re-introduce them. Reviewed-by: Ian Romanick --- src/glsl/loop_analysis.cpp | 2 -- src/glsl/loop_analysis.h | 14 ++++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/glsl/loop_analysis.cpp b/src/glsl/loop_analysis.cpp index 9fc7672fb39..56191447166 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/glsl/loop_analysis.cpp @@ -389,8 +389,6 @@ loop_analysis::visit_leave(ir_loop *ir) ir_rvalue *const inc = get_basic_induction_increment(lv->first_assignment, ls->var_hash); if (inc != NULL) { - lv->iv_scale = NULL; - lv->biv = lv->var; lv->increment = inc; lv->remove(); diff --git a/src/glsl/loop_analysis.h b/src/glsl/loop_analysis.h index c7fa7ea07c7..961ea40c079 100644 --- a/src/glsl/loop_analysis.h +++ b/src/glsl/loop_analysis.h @@ -179,20 +179,14 @@ public: unsigned num_assignments; /** - * Increment values for loop induction variables + * Increment value for a loop induction variable * - * Loop induction variables have a single increment of the form - * \c b * \c biv + \c c, where \c b and \c c are loop constants and \c i - * is a basic loop induction variable. + * If this is a loop induction variable, the amount by which the variable + * is incremented on each iteration through the loop. * - * If \c iv_scale is \c NULL, 1 is used. If \c biv is the same as \c var, - * then \c var is a basic loop induction variable. + * If this is not a loop induction variable, NULL. */ - /*@{*/ - ir_rvalue *iv_scale; - ir_variable *biv; ir_rvalue *increment; - /*@}*/ inline bool is_loop_constant() const -- 2.30.2