Mesa (master): glsl: Remove unused prog parameter from tfeedback_decl::init

Ian Romanick idr at kemper.freedesktop.org
Wed Sep 4 18:34:44 UTC 2013


Module: Mesa
Branch: master
Commit: a974b915b6035d93f1739793094157272444cd1c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a974b915b6035d93f1739793094157272444cd1c

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Aug 30 15:48:26 2013 -0700

glsl: Remove unused prog parameter from tfeedback_decl::init

It looks like commit 53febac removed the last user of that parameter.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/glsl/link_varyings.cpp |    6 +++---
 src/glsl/link_varyings.h   |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 47d9316..081a51d 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -227,8 +227,8 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
  * will fail to find any matching variable.
  */
 void
-tfeedback_decl::init(struct gl_context *ctx, struct gl_shader_program *prog,
-                     const void *mem_ctx, const char *input)
+tfeedback_decl::init(struct gl_context *ctx, const void *mem_ctx,
+                     const char *input)
 {
    /* We don't have to be pedantic about what is a valid GLSL variable name,
     * because any variable with an invalid name can't exist in the IR anyway.
@@ -498,7 +498,7 @@ parse_tfeedback_decls(struct gl_context *ctx, struct gl_shader_program *prog,
                       char **varying_names, tfeedback_decl *decls)
 {
    for (unsigned i = 0; i < num_names; ++i) {
-      decls[i].init(ctx, prog, mem_ctx, varying_names[i]);
+      decls[i].init(ctx, mem_ctx, varying_names[i]);
 
       if (!decls[i].is_varying())
          continue;
diff --git a/src/glsl/link_varyings.h b/src/glsl/link_varyings.h
index 302ab5c..6264ef0 100644
--- a/src/glsl/link_varyings.h
+++ b/src/glsl/link_varyings.h
@@ -91,8 +91,7 @@ struct tfeedback_candidate
 class tfeedback_decl
 {
 public:
-   void init(struct gl_context *ctx, struct gl_shader_program *prog,
-             const void *mem_ctx, const char *input);
+   void init(struct gl_context *ctx, const void *mem_ctx, const char *input);
    static bool is_same(const tfeedback_decl &x, const tfeedback_decl &y);
    bool assign_location(struct gl_context *ctx,
                         struct gl_shader_program *prog);




More information about the mesa-commit mailing list