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

mesa: Silence unused parameter warning in _mesa_init_shader_program

Browse source 
Just remove the parameter.  Silences:

../../src/mesa/main/uniform_query.cpp:1062:1: warning: unused parameter 'ctx' [-Wunused-parameter]

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2014-10-20 14:54:44 -07:00
parent 99e8a3973f
commit 66d950464c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/main/uniform_query.cpp
View file

@ -973,8 +973,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
* array offset in *offset, or GL_INVALID_INDEX (-1).
*/
extern "C" unsigned
_mesa_get_uniform_location(struct gl_context *ctx,
struct gl_shader_program *shProg,
_mesa_get_uniform_location(struct gl_shader_program *shProg,
const GLchar *name,
unsigned *out_offset)
{

8
src/mesa/main/uniforms.c
View file

@ -931,7 +931,7 @@ _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name)
return -1;
}
index = _mesa_get_uniform_location(ctx, shProg, name, &offset);
index = _mesa_get_uniform_location(shProg, name, &offset);
if (index == GL_INVALID_INDEX)
return -1;
@ -1004,7 +1004,7 @@ _mesa_GetUniformIndices(GLuint program,
for (i = 0; i < uniformCount; i++) {
unsigned offset;
uniformIndices[i] = _mesa_get_uniform_location(ctx, shProg,
uniformIndices[i] = _mesa_get_uniform_location(shProg,
uniformNames[i], &offset);
}
}
@ -1110,7 +1110,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program,
for (i = 0; i < block->NumUniforms; i++) {
unsigned offset;
const int idx =
_mesa_get_uniform_location(ctx, shProg,
_mesa_get_uniform_location(shProg,
block->Uniforms[i].IndexName,
&offset);
if (idx != -1)
@ -1127,7 +1127,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program,
for (i = 0; i < block->NumUniforms; i++) {
unsigned offset;
const int idx =
_mesa_get_uniform_location(ctx, shProg,
_mesa_get_uniform_location(shProg,
block->Uniforms[i].IndexName,
&offset);

2
src/mesa/main/uniforms.h
View file

@ -259,7 +259,7 @@ _mesa_parse_program_resource_name(const GLchar *name,
const GLchar **out_base_name_end);
unsigned
_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
_mesa_get_uniform_location(struct gl_shader_program *shProg,
const GLchar *name, unsigned *offset);
void