Mesa (10.1): linker: Clean up "unused parameter" warnings
Carl Worth
cworth at kemper.freedesktop.org
Thu Apr 17 15:12:20 UTC 2014
Module: Mesa
Branch: 10.1
Commit: 7622f1f05a62b4109890df59312ced9c45d8b4cc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7622f1f05a62b4109890df59312ced9c45d8b4cc
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Apr 4 11:11:18 2014 -0700
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 at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76323
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Cc: github at socker.lepus.uberspace.de
(cherry picked from commit 157391a41bc3e0222888d0450405867139ab4c9d)
---
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 cd2307b..fda05b1 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -83,8 +83,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);
@@ -123,8 +122,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);
@@ -252,11 +250,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.");
}
More information about the mesa-commit
mailing list