[Mesa-dev] [PATCH] glsl: Remove unused initialized field from gl_uniform_storage.

[Matt Turner]

---
Should this have been used somewhere?

 src/glsl/ir_uniform.h                  | 5 -----
 src/glsl/link_uniform_initializers.cpp | 4 ----
 src/glsl/link_uniforms.cpp             | 1 -
 src/mesa/main/uniform_query.cpp        | 4 ----
 4 files changed, 14 deletions(-)

diff --git a/src/glsl/ir_uniform.h b/src/glsl/ir_uniform.h
index 2f73528..9c25507 100644
--- a/src/glsl/ir_uniform.h
+++ b/src/glsl/ir_uniform.h
@@ -116,11 +116,6 @@ struct gl_uniform_storage {
     */
    unsigned array_elements;
 
-   /**
-    * Has this uniform ever been set?
-    */
-   bool initialized;
-
    struct gl_opaque_uniform_index sampler[MESA_SHADER_STAGES];
 
    struct gl_opaque_uniform_index image[MESA_SHADER_STAGES];
diff --git a/src/glsl/link_uniform_initializers.cpp 
b/src/glsl/link_uniform_initializers.cpp
index c6fe6a9..809aae5 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -128,8 +128,6 @@ set_sampler_binding(gl_shader_program *prog, const char 
*name, int binding)
          }
       }
    }
-
-   storage->initialized = true;
 }
 
 void
@@ -226,8 +224,6 @@ set_uniform_initializer(void *mem_ctx, gl_shader_program 
*prog,
          }
       }
    }
-
-   storage->initialized = true;
 }
 }
 
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 3251097..f02a074 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -580,7 +580,6 @@ private:
 
       this->uniforms[id].name = ralloc_strdup(this->uniforms, name);
       this->uniforms[id].type = base_type;
-      this->uniforms[id].initialized = 0;
       this->uniforms[id].num_driver_storage = 0;
       this->uniforms[id].driver_storage = NULL;
       this->uniforms[id].storage = this->values;
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 609d94b..88012dd 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -806,8 +806,6 @@ _mesa_uniform(struct gl_context *ctx, struct 
gl_shader_program *shProg,
       }
    }
 
-   uni->initialized = true;
-
    _mesa_propagate_uniforms_to_driver_storage(uni, offset, count);
 
    /* If the uniform is a sampler, do the extra magic necessary to propagate
@@ -982,8 +980,6 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct 
gl_shader_program *shProg,
       }
    }
 
-   uni->initialized = true;
-
    _mesa_propagate_uniforms_to_driver_storage(uni, offset, count);
 }
 
-- 
1.8.5.5

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev