diff options
| -rwxr-xr-x | mesalib/src/glsl/builtin_functions.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/ir.h | 4 | ||||
| -rw-r--r-- | mesalib/src/glsl/ir_clone.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/ir_equals.cpp | 6 | ||||
| -rw-r--r-- | mesalib/src/glsl/ir_print_visitor.cpp | 6 | ||||
| -rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/loop_analysis.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/loop_unroll.cpp | 6 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_copy_propagation_elements.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_cse.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_dead_code_local.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_redundant_jumps.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_vectorize.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 11 | ||||
| -rw-r--r-- | xorg-server/mi/miinitext.c | 8 |
15 files changed, 25 insertions, 34 deletions
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 43746f055..636a7d9f1 100755 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -69,7 +69,7 @@ using namespace ir_builder; * @{ */ static bool -always_available(const _mesa_glsl_parse_state *state) +always_available(const _mesa_glsl_parse_state *) { return true; } diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 8fa3b9ef6..ee276d2be 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -2186,8 +2186,6 @@ private: ir_constant(void); }; -/*@}*/ - /** * IR instruction to emit a vertex in a geometry shader. */ @@ -2235,6 +2233,8 @@ public: virtual ir_visitor_status accept(ir_hierarchical_visitor *); }; +/*@}*/ + /** * Apply a visitor to each IR node in a list */ diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp index 167b80c9f..c00adc564 100644 --- a/mesalib/src/glsl/ir_clone.cpp +++ b/mesalib/src/glsl/ir_clone.cpp @@ -28,7 +28,7 @@ #include "program/hash_table.h" ir_rvalue * -ir_rvalue::clone(void *mem_ctx, struct hash_table *ht) const +ir_rvalue::clone(void *mem_ctx, struct hash_table *) const { /* The only possible instantiation is the generic error value. */ return error_value(mem_ctx); diff --git a/mesalib/src/glsl/ir_equals.cpp b/mesalib/src/glsl/ir_equals.cpp index 484530019..65376cd94 100644 --- a/mesalib/src/glsl/ir_equals.cpp +++ b/mesalib/src/glsl/ir_equals.cpp @@ -41,13 +41,13 @@ possibly_null_equals(ir_instruction *a, ir_instruction *b, enum ir_node_type ign * about. */ bool -ir_instruction::equals(ir_instruction *ir, enum ir_node_type) +ir_instruction::equals(ir_instruction *, enum ir_node_type) { return false; } bool -ir_constant::equals(ir_instruction *ir, enum ir_node_type ignore) +ir_constant::equals(ir_instruction *ir, enum ir_node_type) { const ir_constant *other = ir->as_constant(); if (!other) @@ -65,7 +65,7 @@ ir_constant::equals(ir_instruction *ir, enum ir_node_type ignore) } bool -ir_dereference_variable::equals(ir_instruction *ir, enum ir_node_type ignore) +ir_dereference_variable::equals(ir_instruction *ir, enum ir_node_type) { const ir_dereference_variable *other = ir->as_dereference_variable(); if (!other) diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp index c7786ba9f..6f370b971 100644 --- a/mesalib/src/glsl/ir_print_visitor.cpp +++ b/mesalib/src/glsl/ir_print_visitor.cpp @@ -146,7 +146,7 @@ print_type(FILE *f, const glsl_type *t) } } -void ir_print_visitor::visit(ir_rvalue *ir) +void ir_print_visitor::visit(ir_rvalue *) { fprintf(f, "error"); } @@ -553,13 +553,13 @@ ir_print_visitor::visit(ir_loop_jump *ir) } void -ir_print_visitor::visit(ir_emit_vertex *ir) +ir_print_visitor::visit(ir_emit_vertex *) { fprintf(f, "(emit-vertex)"); } void -ir_print_visitor::visit(ir_end_primitive *ir) +ir_print_visitor::visit(ir_end_primitive *) { fprintf(f, "(end-primitive)"); } diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index b0daeab0b..2ea221944 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -212,7 +212,7 @@ program_resource_visitor::recursion(const glsl_type *t, char **name, void program_resource_visitor::visit_field(const glsl_type *type, const char *name, bool row_major, - const glsl_type *record_type) + const glsl_type *) { visit_field(type, name, row_major); } diff --git a/mesalib/src/glsl/loop_analysis.cpp b/mesalib/src/glsl/loop_analysis.cpp index fd2b6c923..d6a9ac775 100644 --- a/mesalib/src/glsl/loop_analysis.cpp +++ b/mesalib/src/glsl/loop_analysis.cpp @@ -222,7 +222,7 @@ loop_analysis::visit(ir_loop_jump *ir) ir_visitor_status -loop_analysis::visit_enter(ir_call *ir) +loop_analysis::visit_enter(ir_call *) { /* Mark every loop that we're currently analyzing as containing an ir_call * (even those at outer nesting levels). diff --git a/mesalib/src/glsl/loop_unroll.cpp b/mesalib/src/glsl/loop_unroll.cpp index 6eced1736..789655ebd 100644 --- a/mesalib/src/glsl/loop_unroll.cpp +++ b/mesalib/src/glsl/loop_unroll.cpp @@ -70,19 +70,19 @@ public: run(list); } - virtual ir_visitor_status visit_enter(ir_assignment *ir) + virtual ir_visitor_status visit_enter(ir_assignment *) { nodes++; return visit_continue; } - virtual ir_visitor_status visit_enter(ir_expression *ir) + virtual ir_visitor_status visit_enter(ir_expression *) { nodes++; return visit_continue; } - virtual ir_visitor_status visit_enter(ir_loop *ir) + virtual ir_visitor_status visit_enter(ir_loop *) { fail = true; return visit_continue; diff --git a/mesalib/src/glsl/opt_copy_propagation_elements.cpp b/mesalib/src/glsl/opt_copy_propagation_elements.cpp index cc53e0dd0..4d8f476a8 100644 --- a/mesalib/src/glsl/opt_copy_propagation_elements.cpp +++ b/mesalib/src/glsl/opt_copy_propagation_elements.cpp @@ -186,7 +186,7 @@ ir_copy_propagation_elements_visitor::visit_leave(ir_assignment *ir) } ir_visitor_status -ir_copy_propagation_elements_visitor::visit_leave(ir_swizzle *ir) +ir_copy_propagation_elements_visitor::visit_leave(ir_swizzle *) { /* Don't visit the values of swizzles since they are handled while * visiting the swizzle itself. diff --git a/mesalib/src/glsl/opt_cse.cpp b/mesalib/src/glsl/opt_cse.cpp index a2b63ee99..1b8782bcb 100644 --- a/mesalib/src/glsl/opt_cse.cpp +++ b/mesalib/src/glsl/opt_cse.cpp @@ -399,7 +399,7 @@ cse_visitor::visit_enter(ir_loop *ir) } ir_visitor_status -cse_visitor::visit_enter(ir_call *ir) +cse_visitor::visit_enter(ir_call *) { /* Because call is an exec_list of ir_rvalues, handle_rvalue gets passed a * pointer to the (ir_rvalue *) on the stack. Since we save those pointers diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp index 0c5c684a4..c27c526f9 100644 --- a/mesalib/src/glsl/opt_dead_code_local.cpp +++ b/mesalib/src/glsl/opt_dead_code_local.cpp @@ -114,7 +114,7 @@ public: return visit_continue_with_parent; } - virtual ir_visitor_status visit(ir_emit_vertex *ir) + virtual ir_visitor_status visit(ir_emit_vertex *) { /* For the purpose of dead code elimination, emitting a vertex counts as * "reading" all of the currently assigned output variables. diff --git a/mesalib/src/glsl/opt_redundant_jumps.cpp b/mesalib/src/glsl/opt_redundant_jumps.cpp index 8606dcbb7..ee384d0f2 100644 --- a/mesalib/src/glsl/opt_redundant_jumps.cpp +++ b/mesalib/src/glsl/opt_redundant_jumps.cpp @@ -50,7 +50,7 @@ public: * into expressions. */ ir_visitor_status -redundant_jumps_visitor::visit_enter(ir_assignment *ir) +redundant_jumps_visitor::visit_enter(ir_assignment *) { return visit_continue_with_parent; } diff --git a/mesalib/src/glsl/opt_vectorize.cpp b/mesalib/src/glsl/opt_vectorize.cpp index 13faac05e..3306397fd 100644 --- a/mesalib/src/glsl/opt_vectorize.cpp +++ b/mesalib/src/glsl/opt_vectorize.cpp @@ -298,7 +298,7 @@ ir_vectorize_visitor::visit_enter(ir_swizzle *ir) * FINISHME: If all of scalar indices are identical we could vectorize. */ ir_visitor_status -ir_vectorize_visitor::visit_enter(ir_dereference_array *ir) +ir_vectorize_visitor::visit_enter(ir_dereference_array *) { this->current_assignment = NULL; return visit_continue_with_parent; diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index 95987107f..0923357b1 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -229,7 +229,7 @@ public: int next_temp; - variable_storage *find_variable_storage(ir_variable *var); + variable_storage *find_variable_storage(const ir_variable *var); src_reg get_temp(const glsl_type *type); void reladdr_to_temp(ir_instruction *ir, src_reg *reg, int *num_reladdr); @@ -661,9 +661,8 @@ ir_to_mesa_visitor::get_temp(const glsl_type *type) } variable_storage * -ir_to_mesa_visitor::find_variable_storage(ir_variable *var) +ir_to_mesa_visitor::find_variable_storage(const ir_variable *var) { - variable_storage *entry; foreach_list(node, &this->variables) { @@ -1964,7 +1963,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir) } void -ir_to_mesa_visitor::visit(ir_call *ir) +ir_to_mesa_visitor::visit(ir_call *) { assert(!"ir_to_mesa: All function calls should have been inlined by now."); } @@ -2228,13 +2227,13 @@ ir_to_mesa_visitor::visit(ir_if *ir) } void -ir_to_mesa_visitor::visit(ir_emit_vertex *ir) +ir_to_mesa_visitor::visit(ir_emit_vertex *) { assert(!"Geometry shaders not supported."); } void -ir_to_mesa_visitor::visit(ir_end_primitive *ir) +ir_to_mesa_visitor::visit(ir_end_primitive *) { assert(!"Geometry shaders not supported."); } diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 5b45ab4c2..1d905167e 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -365,7 +365,6 @@ void LoadExtensionList(const ExtensionModule ext[], int size, Bool builtin) { ExtensionModule *newext; - const char *msg; int i; /* Make sure built-in extensions get added to the list before those @@ -375,14 +374,7 @@ LoadExtensionList(const ExtensionModule ext[], int size, Bool builtin) if (!(newext = NewExtensionModuleList(size))) return; - if (builtin) - msg = "Initializing built-in"; - else - msg = "Loading"; - for (i = 0; i < size; i++, newext++) { - ErrorF("%s extension %s\n", msg, ext[i].name); - newext->name = ext[i].name; newext->initFunc = ext[i].initFunc; newext->disablePtr = ext[i].disablePtr; |