[Mesa-stable] [PATCH 4/7] linker: Clean up "unused parameter" warnings

Ian Romanick idr at freedesktop.org
Fri Apr 4 14:01:43 PDT 2014


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

../../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 at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76323
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Cc: github at socker.lepus.uberspace.de
---
 src/glsl/link_uniform_initializers.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
index bbdeec9..c633850 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.");
             }
-- 
1.8.1.4



More information about the mesa-stable mailing list