[Mesa-dev] [PATCH 32/32] glsl: Remove ir_variable::uniform_block

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/glsl/ast_to_hir.cpp |  1 -
 src/glsl/ir.cpp         |  1 -
 src/glsl/ir.h           | 10 ----------
 src/glsl/ir_clone.cpp   |  1 -
 4 files changed, 13 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index bace186..e7a72f3 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4255,7 +4255,6 @@ ast_uniform_block::hir(exec_list *instructions,
             new(state) ir_variable(fields[i].type,
                                    ralloc_strdup(state, fields[i].name),
                                    ir_var_uniform);
-         var->uniform_block = ubo - state->uniform_blocks;
          var->interface_type = block_type;
 
          state->symbols->add_variable(var);
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 703f5ec..eba9aaf 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -1493,7 +1493,6 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name,
    this->has_initializer = false;
    this->location = -1;
    this->location_frac = 0;
-   this->uniform_block = -1;
    this->warn_extension = NULL;
    this->constant_value = NULL;
    this->constant_initializer = NULL;
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index a776f49..9a23e75 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -497,16 +497,6 @@ public:
    int location;
 
    /**
-    * Uniform block number for uniforms.
-    *
-    * This index is into the shader's list of uniform blocks, not the
-    * linked program's merged list.
-    *
-    * If the variable is not in a uniform block, the value will be -1.
-    */
-   int uniform_block;
-
-   /**
     * output index for dual source blending.
     */
    int index;
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index c221a96..b94ff05 100644
--- a/src/glsl/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
@@ -50,7 +50,6 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
    var->interpolation = this->interpolation;
    var->location = this->location;
    var->index = this->index;
-   var->uniform_block = this->uniform_block;
    var->warn_extension = this->warn_extension;
    var->origin_upper_left = this->origin_upper_left;
    var->pixel_center_integer = this->pixel_center_integer;
-- 
1.7.11.7