diff options
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/ast_type.cpp | 7 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 5 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_constant_expression.cpp | 8 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 7 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_distance.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_array_splitting.cpp | 2 |
6 files changed, 12 insertions, 19 deletions
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index ee8697ba218..e9d60de5baf 100644 --- a/src/compiler/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp @@ -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; } diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index cfb214e4404..2c42716ade7 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -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) diff --git a/src/compiler/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp index 2fc23baba79..fe9bd1d0b4a 100644 --- a/src/compiler/glsl/ir_constant_expression.cpp +++ b/src/compiler/glsl/ir_constant_expression.cpp @@ -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; } diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 5c3f1d12bbc..141bf430370 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -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); diff --git a/src/compiler/glsl/lower_distance.cpp b/src/compiler/glsl/lower_distance.cpp index 4d8d66b7cc6..530f79d4dff 100644 --- a/src/compiler/glsl/lower_distance.cpp +++ b/src/compiler/glsl/lower_distance.cpp @@ -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; } diff --git a/src/compiler/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp index d2e81665b7e..7d928b9356b 100644 --- a/src/compiler/glsl/opt_array_splitting.cpp +++ b/src/compiler/glsl/opt_array_splitting.cpp @@ -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; |