From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 4 Apr 2014 18:11:18 +0000 (-0700)
Subject: linker: Clean up "unused parameter" warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=157391a41bc3e0222888d0450405867139ab4c9d;p=mesa.git

linker: Clean up "unused parameter" warnings

../../src/glsl/link_uniform_initializers.cpp:87:1: warning: unused parameter 'mem_ctx' [-Wunused-parameter]
../../src/glsl/link_uniform_initializers.cpp:87:1: warning: unused parameter 'type' [-Wunused-parameter]
../../src/glsl/link_uniform_initializers.cpp:127:1: warning: unused parameter 'mem_ctx' [-Wunused-parameter]
../../src/glsl/link_uniform_initializers.cpp:127:1: warning: unused parameter 'type' [-Wunused-parameter]

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76323
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "10.1" <mesa-stable@lists.freedesktop.org>
Cc: github@socker.lepus.uberspace.de
---

diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
index bbdeec9039c..c6338502d08 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -84,8 +84,7 @@ copy_constant_to_storage(union gl_constant_value *storage,
 }
 
 void
-set_sampler_binding(void *mem_ctx, gl_shader_program *prog,
-                    const char *name, const glsl_type *type, int binding)
+set_sampler_binding(gl_shader_program *prog, const char *name, int binding)
 {
    struct gl_uniform_storage *const storage =
       get_storage(prog->UniformStorage, prog->NumUserUniformStorage, name);
@@ -124,8 +123,7 @@ set_sampler_binding(void *mem_ctx, gl_shader_program *prog,
 }
 
 void
-set_block_binding(void *mem_ctx, gl_shader_program *prog,
-                  const char *name, const glsl_type *type, int binding)
+set_block_binding(gl_shader_program *prog, const char *name, int binding)
 {
    struct gl_uniform_storage *const storage =
       get_storage(prog->UniformStorage, prog->NumUserUniformStorage, name);
@@ -253,11 +251,9 @@ link_set_uniform_initializers(struct gl_shader_program *prog)
 
             if (type->is_sampler()
                 || (type->is_array() && type->fields.array->is_sampler())) {
-               linker::set_sampler_binding(mem_ctx, prog, var->name,
-                                           type, var->data.binding);
+               linker::set_sampler_binding(prog, var->name, var->data.binding);
             } else if (var->is_in_uniform_block()) {
-               linker::set_block_binding(mem_ctx, prog, var->name,
-                                         type, var->data.binding);
+               linker::set_block_binding(prog, var->name, var->data.binding);
             } else {
                assert(!"Explicit binding not on a sampler or UBO.");
             }