From 6469a282ad06dfa53f3b9d9e9789f21b76de9ab7 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 29 Mar 2014 13:48:13 +0100 Subject: xserver mesa git update 29 Mar 2014 xserver commit 8468e24430988058b150dc1daef3aad6ba9fa698 mesa commit 9b6b084eb7b10d006b44e3cd22585fc3e39e0c00 --- mesalib/src/mesa/program/ir_to_mesa.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'mesalib/src/mesa') 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."); } -- cgit v1.2.3