<div dir="ltr">On 30 August 2013 16:07, Ian Romanick <span dir="ltr"><<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
<br>
It looks like commit 53febac removed the last user of that parameter.<br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
Cc: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br></blockquote><div><br></div><div>Patches 2-4 are:<br><br></div><div>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/glsl/link_varyings.cpp | 6 +++---<br>
src/glsl/link_varyings.h | 3 +--<br>
2 files changed, 4 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp<br>
index 7a61b1a..c3b5855 100644<br>
--- a/src/glsl/link_varyings.cpp<br>
+++ b/src/glsl/link_varyings.cpp<br>
@@ -236,8 +236,8 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,<br>
* will fail to find any matching variable.<br>
*/<br>
void<br>
-tfeedback_decl::init(struct gl_context *ctx, struct gl_shader_program *prog,<br>
- const void *mem_ctx, const char *input)<br>
+tfeedback_decl::init(struct gl_context *ctx, const void *mem_ctx,<br>
+ const char *input)<br>
{<br>
/* We don't have to be pedantic about what is a valid GLSL variable name,<br>
* because any variable with an invalid name can't exist in the IR anyway.<br>
@@ -507,7 +507,7 @@ parse_tfeedback_decls(struct gl_context *ctx, struct gl_shader_program *prog,<br>
char **varying_names, tfeedback_decl *decls)<br>
{<br>
for (unsigned i = 0; i < num_names; ++i) {<br>
- decls[i].init(ctx, prog, mem_ctx, varying_names[i]);<br>
+ decls[i].init(ctx, mem_ctx, varying_names[i]);<br>
<br>
if (!decls[i].is_varying())<br>
continue;<br>
diff --git a/src/glsl/link_varyings.h b/src/glsl/link_varyings.h<br>
index 302ab5c..6264ef0 100644<br>
--- a/src/glsl/link_varyings.h<br>
+++ b/src/glsl/link_varyings.h<br>
@@ -91,8 +91,7 @@ struct tfeedback_candidate<br>
class tfeedback_decl<br>
{<br>
public:<br>
- void init(struct gl_context *ctx, struct gl_shader_program *prog,<br>
- const void *mem_ctx, const char *input);<br>
+ void init(struct gl_context *ctx, const void *mem_ctx, const char *input);<br>
static bool is_same(const tfeedback_decl &x, const tfeedback_decl &y);<br>
bool assign_location(struct gl_context *ctx,<br>
struct gl_shader_program *prog);<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.1.4<br>
<br>
</font></span></blockquote></div><br></div></div>