aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-03-29 13:49:21 +0100
committermarha <marha@users.sourceforge.net>2014-03-29 13:49:21 +0100
commit630c3accd9d72b2b64dc1c44a11c5ef61396f509 (patch)
tree77ba5a3d688eacae823225942b7251580b4bf62a /mesalib/src/mesa/program
parent409cbaf20b5c695444bd08c87f4a186b9ac6b805 (diff)
parent6469a282ad06dfa53f3b9d9e9789f21b76de9ab7 (diff)
downloadvcxsrv-630c3accd9d72b2b64dc1c44a11c5ef61396f509.tar.gz
vcxsrv-630c3accd9d72b2b64dc1c44a11c5ef61396f509.tar.bz2
vcxsrv-630c3accd9d72b2b64dc1c44a11c5ef61396f509.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/program')
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp11
1 files changed, 5 insertions, 6 deletions
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.");
}