OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Silence unused parameter warnings

Browse Source 
glsl/standalone_scaffolding.cpp: In function ‘GLbitfield _mesa_program_state_flags(const gl_state_index*)’:
glsl/standalone_scaffolding.cpp:103:66: warning: unused parameter ‘state’ [-Wunused-parameter]
 _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
                                                                  ^
glsl/standalone_scaffolding.cpp: In function ‘char* _mesa_program_state_string(const gl_state_index*)’:
glsl/standalone_scaffolding.cpp:109:67: warning: unused parameter ‘state’ [-Wunused-parameter]
 _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
                                                                   ^
glsl/standalone_scaffolding.cpp: In function ‘void _mesa_delete_shader(gl_context*, gl_shader*)’:
glsl/standalone_scaffolding.cpp:115:40: warning: unused parameter ‘ctx’ [-Wunused-parameter]
 _mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
                                        ^~~
glsl/standalone_scaffolding.cpp: In function ‘void _mesa_delete_linked_shader(gl_context*, gl_linked_shader*)’:
glsl/standalone_scaffolding.cpp:123:47: warning: unused parameter ‘ctx’ [-Wunused-parameter]
 _mesa_delete_linked_shader(struct gl_context *ctx,
                                               ^~~

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Ian Romanick
2017-09-25 18:06:17 -07:00
parent 7dae419aa7
commit d70e8ef1c1
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl/standalone.cpp
View File

@@ -101,7 +101,7 @@ private:
};
static void
init_gl_program(struct gl_program *prog, GLenum target, bool is_arb_asm)
init_gl_program(struct gl_program *prog, bool is_arb_asm)
{
prog->RefCount = 1;
prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
@@ -109,7 +109,8 @@ init_gl_program(struct gl_program *prog, GLenum target, bool is_arb_asm)
}
static struct gl_program *
new_program(struct gl_context *ctx, GLenum target, GLuint id, bool is_arb_asm)
new_program(UNUSED struct gl_context *ctx, GLenum target,
UNUSED GLuint id, bool is_arb_asm)
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
@@ -119,7 +120,7 @@ new_program(struct gl_context *ctx, GLenum target, GLuint id, bool is_arb_asm)
case GL_FRAGMENT_PROGRAM_ARB:
case GL_COMPUTE_PROGRAM_NV: {
struct gl_program *prog = rzalloc(NULL, struct gl_program);
init_gl_program(prog, target, is_arb_asm);
init_gl_program(prog, is_arb_asm);
return prog;
}
default:

8
src/compiler/glsl/standalone_scaffolding.cpp
View File

@@ -100,19 +100,19 @@ _mesa_new_shader(GLuint name, gl_shader_stage stage)
}
GLbitfield
_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
_mesa_program_state_flags(UNUSED const gl_state_index state[STATE_LENGTH])
{
return 0;
}
char *
_mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
_mesa_program_state_string(UNUSED const gl_state_index state[STATE_LENGTH])
{
return NULL;
}
void
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
_mesa_delete_shader(struct gl_context *, struct gl_shader *sh)
{
free((void *)sh->Source);
free(sh->Label);
@@ -120,7 +120,7 @@ _mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
}
void
_mesa_delete_linked_shader(struct gl_context *ctx,
_mesa_delete_linked_shader(struct gl_context *,
struct gl_linked_shader *sh)
{
ralloc_free(sh);