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

glsl: Silence unused parameter warnings

Browse source 
builtin_variables.cpp:1062:53: warning: unused parameter 'name_as_gs_input' [-Wunused-parameter]
                                         const char *name_as_gs_input)
                                                     ^
builtin_functions.cpp:4774:47: warning: unused parameter 'intrinsic_name' [-Wunused-parameter]
                                   const char *intrinsic_name,
                                               ^
builtin_functions.cpp:4907:66: warning: unused parameter 'state' [-Wunused-parameter]
 _mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state,
                                                                  ^
builtin_functions.cpp:4915:49: warning: unused parameter 'num_arguments' [-Wunused-parameter]
                                        unsigned num_arguments,
                                                 ^
builtin_functions.cpp:4916:49: warning: unused parameter 'flags' [-Wunused-parameter]
                                        unsigned flags)
                                                 ^
ir_print_visitor.cpp:589:37: warning: unused parameter 'ir' [-Wunused-parameter]
 ir_print_visitor::visit(ir_barrier *ir)
                                     ^
linker.cpp:3212:48: warning: unused parameter 'ctx' [-Wunused-parameter]
 build_program_resource_list(struct gl_context *ctx,
                                                ^
standalone_scaffolding.cpp:65:57: warning: unused parameter ‘id’ [-Wunused-parameter]
 _mesa_shader_debug(struct gl_context *, GLenum, GLuint *id,
                                                         ^

v2: Rebase on top of GL_ARB_shader_image_size work (especially
58a86897).  Silence more warnings added by that work.

v3: Remove mention of the removed parameter from comments.  Suggested by
Iago.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> [v1]
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Cc: "Martin Peres <martin.peres@linux.intel.com>"
This commit is contained in:
Ian Romanick 2015-08-26 13:38:49 +01:00
parent 342e68dc60
commit bd0245b8b2
9 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glsl/ast_to_hir.cpp
View file

@ -4578,7 +4578,7 @@ ast_function::hir(exec_list *instructions,
if (state->es_shader && state->language_version >= 300) {
/* Local shader has no exact candidates; check the built-ins. */
_mesa_glsl_initialize_builtin_functions();
if (_mesa_glsl_find_builtin_function_by_name(state, name)) {
if (_mesa_glsl_find_builtin_function_by_name(name)) {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state,
"A shader cannot redefine or overload built-in "

14
src/glsl/builtin_functions.cpp
View file

@ -522,7 +522,6 @@ private:
void add_function(const char *name, ...);
typedef ir_function_signature *(builtin_builder::*image_prototype_ctr)(const glsl_type *image_type,
const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
@ -738,11 +737,9 @@ private:
B1(mid3)
ir_function_signature *_image_prototype(const glsl_type *image_type,
const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
ir_function_signature *_image_size_prototype(const glsl_type *image_type,
const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
ir_function_signature *_image(image_prototype_ctr prototype,
@ -4866,7 +4863,6 @@ builtin_builder::_mid3(const glsl_type *type)
ir_function_signature *
builtin_builder::_image_prototype(const glsl_type *image_type,
const char *intrinsic_name,
unsigned num_arguments,
unsigned flags)
{
@ -4916,9 +4912,8 @@ builtin_builder::_image_prototype(const glsl_type *image_type,
ir_function_signature *
builtin_builder::_image_size_prototype(const glsl_type *image_type,
const char *intrinsic_name,
unsigned num_arguments,
unsigned flags)
unsigned /* num_arguments */,
unsigned /* flags */)
{
const glsl_type *ret_type;
unsigned num_components = image_type->coordinate_components();
@ -4962,7 +4957,7 @@ builtin_builder::_image(image_prototype_ctr prototype,
unsigned num_arguments,
unsigned flags)
{
ir_function_signature *sig = (this->*prototype)(image_type, intrinsic_name,
ir_function_signature *sig = (this->*prototype)(image_type,
num_arguments, flags);
if (flags & IMAGE_FUNCTION_EMIT_STUB) {
@ -5043,8 +5038,7 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
}
ir_function *
_mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state,
const char *name)
_mesa_glsl_find_builtin_function_by_name(const char *name)
{
ir_function *f;
mtx_lock(&builtins_lock);

11
src/glsl/builtin_variables.cpp
View file

@ -383,8 +383,7 @@ private:
ir_variable *add_uniform(const glsl_type *type, const char *name);
ir_variable *add_const(const char *name, int value);
ir_variable *add_const_ivec3(const char *name, int x, int y, int z);
void add_varying(int slot, const glsl_type *type, const char *name,
const char *name_as_gs_input);
void add_varying(int slot, const glsl_type *type, const char *name);
exec_list * const instructions;
struct _mesa_glsl_parse_state * const state;
@ -1059,13 +1058,11 @@ builtin_variable_generator::generate_cs_special_vars()
/**
* Add a single "varying" variable. The variable's type and direction (input
* or output) are adjusted as appropriate for the type of shader being
* compiled. For geometry shaders using {ARB,EXT}_geometry_shader4,
* name_as_gs_input is used for the input (to avoid ambiguity).
* compiled.
*/
void
builtin_variable_generator::add_varying(int slot, const glsl_type *type,
const char *name,
const char *name_as_gs_input)
const char *name)
{
switch (state->stage) {
case MESA_SHADER_TESS_CTRL:
@ -1094,7 +1091,7 @@ void
builtin_variable_generator::generate_varyings()
{
#define ADD_VARYING(loc, type, name) \
add_varying(loc, type, name, name "In")
add_varying(loc, type, name)
/* gl_Position and gl_PointSize are not visible from fragment shaders. */
if (state->stage != MESA_SHADER_FRAGMENT) {

3
src/glsl/ir.h
View file

@ -2523,8 +2523,7 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
const char *name, exec_list *actual_parameters);
extern ir_function *
_mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state,
const char *name);
_mesa_glsl_find_builtin_function_by_name(const char *name);
extern gl_shader *
_mesa_glsl_get_builtin_function_shader(void);

2
src/glsl/ir_print_visitor.cpp
View file

@ -586,7 +586,7 @@ ir_print_visitor::visit(ir_end_primitive *ir)
}
void
ir_print_visitor::visit(ir_barrier *ir)
ir_print_visitor::visit(ir_barrier *)
{
fprintf(f, "(barrier)\n");
}

3
src/glsl/linker.cpp
View file

@ -3216,8 +3216,7 @@ add_interface_variables(struct gl_shader_program *shProg,
* resource data.
*/
void
build_program_resource_list(struct gl_context *ctx,
struct gl_shader_program *shProg)
build_program_resource_list(struct gl_shader_program *shProg)
{
/* Rebuild resource list. */
if (shProg->ProgramResourceList) {

3
src/glsl/program.h
View file

@ -40,8 +40,7 @@ extern void
link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
extern void
build_program_resource_list(struct gl_context *ctx,
struct gl_shader_program *shProg);
build_program_resource_list(struct gl_shader_program *shProg);
extern void
linker_error(struct gl_shader_program *prog, const char *fmt, ...)

2
src/glsl/standalone_scaffolding.cpp
View file

@ -62,7 +62,7 @@ _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
}
void
_mesa_shader_debug(struct gl_context *, GLenum, GLuint *id,
_mesa_shader_debug(struct gl_context *, GLenum, GLuint *,
const char *, int)
{
}

2
src/mesa/program/ir_to_mesa.cpp
View file

@ -2979,7 +2979,7 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
if (!ctx->Driver.LinkShader(ctx, prog)) {
prog->LinkStatus = GL_FALSE;
} else {
build_program_resource_list(ctx, prog);
build_program_resource_list(prog);
}
}