fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 23:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

linker: Clean up "unused parameter" warnings

Browse source 
../../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
(cherry picked from commit 157391a41b)
This commit is contained in:
Ian Romanick 2014-04-04 11:11:18 -07:00 • committed by Carl Worth
parent c862a14676
commit b3f1ee8b18
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/glsl/link_uniform_initializers.cpp
View file

@ -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 if (type->contains_atomic()) {
/* we don't actually need to do anything. */
} else {