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

mesa: Silence unused parameter warnings

Browse source 
Neither shProg nor name was used.  Remove them both.

main/shader_query.cpp:779:53: warning: unused parameter ‘shProg’ [-Wunused-parameter]
 program_resource_location(struct gl_shader_program *shProg,
                                                     ^
main/shader_query.cpp:780:72: warning: unused parameter ‘name’ [-Wunused-parameter]
                           struct gl_program_resource *res, const char *name,
                                                                        ^

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
Ian Romanick 2016-05-18 18:26:34 -07:00
parent 78399cf170
commit 7fc4a82007
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/main/shader_query.cpp
View file

@ -42,8 +42,7 @@
static GLint
program_resource_location(struct gl_shader_program *shProg,
struct gl_program_resource *res, const char *name,
program_resource_location(struct gl_program_resource *res,
unsigned array_index);
/**
@ -187,7 +186,7 @@ _mesa_GetAttribLocation(GLuint program, const GLchar * name)
if (!res)
return -1;
return program_resource_location(shProg, res, name, array_index);
return program_resource_location(res, array_index);
}
unsigned
@ -360,7 +359,7 @@ _mesa_GetFragDataLocation(GLuint program, const GLchar *name)
if (!res)
return -1;
return program_resource_location(shProg, res, name, array_index);
return program_resource_location(res, array_index);
}
const char*
@ -776,9 +775,7 @@ _mesa_get_program_resource_name(struct gl_shader_program *shProg,
}
static GLint
program_resource_location(struct gl_shader_program *shProg,
struct gl_program_resource *res, const char *name,
unsigned array_index)
program_resource_location(struct gl_program_resource *res, unsigned array_index)
{
switch (res->Type) {
case GL_PROGRAM_INPUT: {
@ -866,7 +863,7 @@ _mesa_program_resource_location(struct gl_shader_program *shProg,
if (!res)
return -1;
return program_resource_location(shProg, res, name, array_index);
return program_resource_location(res, array_index);
}
/**
@ -1222,9 +1219,7 @@ _mesa_program_resource_prop(struct gl_shader_program *shProg,
case GL_TESS_EVALUATION_SUBROUTINE_UNIFORM:
case GL_PROGRAM_INPUT:
case GL_PROGRAM_OUTPUT:
*val = program_resource_location(shProg, res,
_mesa_program_resource_name(res),
0);
*val = program_resource_location(res, 0);
return 1;
default:
goto invalid_operation;