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

glsl: Silence unused parameter warnings

Browse source 
glsl/ast_type.cpp: In function ‘void merge_bindless_qualifier(YYLTYPE*, _mesa_glsl_parse_state*, const ast_type_qualifier&, const ast_type_qualifier&)’:
glsl/ast_type.cpp:189:35: warning: unused parameter ‘loc’ [-Wunused-parameter]
 merge_bindless_qualifier(YYLTYPE *loc,
                                   ^~~
glsl/ast_type.cpp:191:52: warning: unused parameter ‘qualifier’ [-Wunused-parameter]
                          const ast_type_qualifier &qualifier,
                                                    ^~~~~~~~~
glsl/ast_type.cpp:192:52: warning: unused parameter ‘new_qualifier’ [-Wunused-parameter]
                          const ast_type_qualifier &new_qualifier)
                                                    ^~~~~~~~~~~~~

glsl/ir_constant_expression.cpp: In member function ‘virtual ir_constant* ir_rvalue::constant_expression_value(void*, hash_table*)’:
glsl/ir_constant_expression.cpp:512:44: warning: unused parameter ‘mem_ctx’ [-Wunused-parameter]
 ir_rvalue::constant_expression_value(void *mem_ctx, struct hash_table *)
                                            ^~~~~~~
glsl/ir_constant_expression.cpp: In member function ‘virtual ir_constant* ir_texture::constant_expression_value(void*, hash_table*)’:
glsl/ir_constant_expression.cpp:705:45: warning: unused parameter ‘mem_ctx’ [-Wunused-parameter]
 ir_texture::constant_expression_value(void *mem_ctx, struct hash_table *)
                                             ^~~~~~~
glsl/ir_constant_expression.cpp: In member function ‘virtual ir_constant* ir_assignment::constant_expression_value(void*, hash_table*)’:
glsl/ir_constant_expression.cpp:851:48: warning: unused parameter ‘mem_ctx’ [-Wunused-parameter]
 ir_assignment::constant_expression_value(void *mem_ctx, struct hash_table *)
                                                ^~~~~~~
glsl/ir_constant_expression.cpp: In member function ‘virtual ir_constant* ir_constant::constant_expression_value(void*, hash_table*)’:
glsl/ir_constant_expression.cpp:859:46: warning: unused parameter ‘mem_ctx’ [-Wunused-parameter]
 ir_constant::constant_expression_value(void *mem_ctx, struct hash_table *)
                                              ^~~~~~~

glsl/linker.cpp: In function ‘void link_xfb_stride_layout_qualifiers(gl_context*, gl_shader_program*, gl_linked_shader*, gl_shader**, unsigned int)’:
glsl/linker.cpp:1655:60: warning: unused parameter ‘linked_shader’ [-Wunused-parameter]
                                   struct gl_linked_shader *linked_shader,
                                                            ^~~~~~~~~~~~~
glsl/linker.cpp: In function ‘void link_bindless_layout_qualifiers(gl_shader_program*, gl_program*, gl_shader**, unsigned int)’:
glsl/linker.cpp:1693:52: warning: unused parameter ‘gl_prog’ [-Wunused-parameter]
                                 struct gl_program *gl_prog,
                                                    ^~~~~~~

glsl/lower_distance.cpp: In member function ‘virtual void {anonymous}::lower_distance_visitor_counter::handle_rvalue(ir_rvalue**)’:
glsl/lower_distance.cpp:652:59: warning: unused parameter ‘rv’ [-Wunused-parameter]
 lower_distance_visitor_counter::handle_rvalue(ir_rvalue **rv)
                                                           ^~

glsl/opt_array_splitting.cpp: In member function ‘virtual ir_visitor_status {anonymous}::ir_array_reference_visitor::visit_leave(ir_assignment*)’:
glsl/opt_array_splitting.cpp:198:56: warning: unused parameter ‘ir’ [-Wunused-parameter]
 ir_array_reference_visitor::visit_leave(ir_assignment *ir)
                                                        ^~

glsl/glsl_parser_extras.cpp: In function ‘void assign_subroutine_indexes(gl_shader*, _mesa_glsl_parse_state*)’:
glsl/glsl_parser_extras.cpp:1869:45: warning: unused parameter ‘sh’ [-Wunused-parameter]
 assign_subroutine_indexes(struct gl_shader *sh,
                                             ^~

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
This commit is contained in:
Ian Romanick 2017-09-07 18:40:11 -07:00
parent c408c92d28
commit e5145e28ea
6 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/compiler/glsl/ast_type.cpp
View file

@ -186,10 +186,7 @@ validate_point_mode(MAYBE_UNUSED const ast_type_qualifier &qualifier,
}
static void
merge_bindless_qualifier(YYLTYPE *loc,
_mesa_glsl_parse_state *state,
const ast_type_qualifier &qualifier,
const ast_type_qualifier &new_qualifier)
merge_bindless_qualifier(_mesa_glsl_parse_state *state)
{
if (state->default_uniform_qualifier->flags.q.bindless_sampler) {
state->bindless_sampler_specified = true;
@ -484,7 +481,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
q.flags.q.bindless_image ||
q.flags.q.bound_sampler ||
q.flags.q.bound_image)
merge_bindless_qualifier(loc, state, *this, q);
merge_bindless_qualifier(state);
return r;
}

5
src/compiler/glsl/glsl_parser_extras.cpp
View file

@ -1866,8 +1866,7 @@ set_shader_inout_layout(struct gl_shader *shader,
extern "C" {
static void
assign_subroutine_indexes(struct gl_shader *sh,
struct _mesa_glsl_parse_state *state)
assign_subroutine_indexes(struct _mesa_glsl_parse_state *state)
{
int j, k;
int index = 0;
@ -2105,7 +2104,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
shader->IsES = state->es_shader;
if (!state->error && !shader->ir->is_empty()) {
assign_subroutine_indexes(shader, state);
assign_subroutine_indexes(state);
lower_subroutine(shader->ir, state);
if (!ctx->Cache || force_recompile)

8
src/compiler/glsl/ir_constant_expression.cpp
View file

@ -509,7 +509,7 @@ constant_referenced(const ir_dereference *deref,
ir_constant *
ir_rvalue::constant_expression_value(void *mem_ctx, struct hash_table *)
ir_rvalue::constant_expression_value(void *, struct hash_table *)
{
assert(this->type->is_error());
return NULL;
@ -702,7 +702,7 @@ ir_expression::constant_expression_value(void *mem_ctx,
ir_constant *
ir_texture::constant_expression_value(void *mem_ctx, struct hash_table *)
ir_texture::constant_expression_value(void *, struct hash_table *)
{
/* texture lookups aren't constant expressions */
return NULL;
@ -848,7 +848,7 @@ ir_dereference_record::constant_expression_value(void *mem_ctx,
ir_constant *
ir_assignment::constant_expression_value(void *mem_ctx, struct hash_table *)
ir_assignment::constant_expression_value(void *, struct hash_table *)
{
/* FINISHME: Handle CEs involving assignment (return RHS) */
return NULL;
@ -856,7 +856,7 @@ ir_assignment::constant_expression_value(void *mem_ctx, struct hash_table *)
ir_constant *
ir_constant::constant_expression_value(void *mem_ctx, struct hash_table *)
ir_constant::constant_expression_value(void *, struct hash_table *)
{
return this;
}

7
src/compiler/glsl/linker.cpp
View file

@ -1652,7 +1652,6 @@ validate_xfb_buffer_stride(struct gl_context *ctx, unsigned idx,
static void
link_xfb_stride_layout_qualifiers(struct gl_context *ctx,
struct gl_shader_program *prog,
struct gl_linked_shader *linked_shader,
struct gl_shader **shader_list,
unsigned num_shaders)
{
@ -1690,7 +1689,6 @@ link_xfb_stride_layout_qualifiers(struct gl_context *ctx,
*/
static void
link_bindless_layout_qualifiers(struct gl_shader_program *prog,
struct gl_program *gl_prog,
struct gl_shader **shader_list,
unsigned num_shaders)
{
@ -2286,10 +2284,9 @@ link_intrastage_shaders(void *mem_ctx,
link_cs_input_layout_qualifiers(prog, gl_prog, shader_list, num_shaders);
if (linked->Stage != MESA_SHADER_FRAGMENT)
link_xfb_stride_layout_qualifiers(ctx, prog, linked, shader_list,
num_shaders);
link_xfb_stride_layout_qualifiers(ctx, prog, shader_list, num_shaders);
link_bindless_layout_qualifiers(prog, gl_prog, shader_list, num_shaders);
link_bindless_layout_qualifiers(prog, shader_list, num_shaders);
populate_symbol_table(linked);

2
src/compiler/glsl/lower_distance.cpp
View file

@ -649,7 +649,7 @@ lower_distance_visitor_counter::visit(ir_variable *ir)
}
void
lower_distance_visitor_counter::handle_rvalue(ir_rvalue **rv)
lower_distance_visitor_counter::handle_rvalue(ir_rvalue **)
{
return;
}

2
src/compiler/glsl/opt_array_splitting.cpp
View file

@ -195,7 +195,7 @@ ir_array_reference_visitor::visit_enter(ir_assignment *ir)
}
ir_visitor_status
ir_array_reference_visitor::visit_leave(ir_assignment *ir)
ir_array_reference_visitor::visit_leave(ir_assignment *)
{
in_whole_array_copy = false;