5 files changed, 8 insertions, 9 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 467722c8680..aaf1e57ae28 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -64,8 +64,7 @@ process_call(exec_list *instructions, ir_function *f,
 {
    void *ctx = state;
 
-   const ir_function_signature *sig =
-      f->matching_signature(actual_parameters);
+   ir_function_signature *sig = f->matching_signature(actual_parameters);
 
    /* The instructions param will be used when the FINISHMEs below are done */
    (void) instructions;
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index fcf5deced8d..70905ddb80f 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -839,7 +839,7 @@ ir_call::get_error_instruction(void *ctx)
 }
 
 void
-ir_call::set_callee(const ir_function_signature *sig)
+ir_call::set_callee(ir_function_signature *sig)
 {
    assert((this->type == NULL) || (this->type == sig->return_type));
 
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 9d7af2dcabc..042da94d853 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -661,7 +661,7 @@ public:
  */
 class ir_call : public ir_rvalue {
 public:
-   ir_call(const ir_function_signature *callee, exec_list *actual_parameters)
+   ir_call(ir_function_signature *callee, exec_list *actual_parameters)
       : callee(callee)
    {
       assert(callee->return_type != NULL);
@@ -706,7 +706,7 @@ public:
       return callee->function_name();
    }
 
-   const ir_function_signature *get_callee()
+   ir_function_signature *get_callee()
    {
       return callee;
    }
@@ -714,7 +714,7 @@ public:
    /**
     * Set the function call target
     */
-   void set_callee(const ir_function_signature *sig);
+   void set_callee(ir_function_signature *sig);
 
    /**
     * Generates an inline version of the function before @ir,
@@ -729,7 +729,7 @@ private:
       /* empty */
    }
 
-   const ir_function_signature *callee;
+   ir_function_signature *callee;
 
    /* List of ir_rvalue of paramaters passed in this call. */
    exec_list actual_parameters;
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index c7b786f0c48..91d6977354d 100644
--- a/src/glsl/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
@@ -356,7 +356,7 @@ public:
       /* Try to find the function signature referenced by the ir_call in the
        * table.  If it is found, replace it with the value from the table.
        */
-      const ir_function_signature *const sig =
+      ir_function_signature *sig =
 	 (ir_function_signature *) hash_table_find(this->ht, ir->get_callee());
       if (sig != NULL)
 	 ir->set_callee(sig);
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index c83f92ef575..a1e5a7ad74b 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -632,7 +632,7 @@ read_call(_mesa_glsl_parse_state *st, s_list *list)
       return NULL;
    }
 
-   const ir_function_signature *callee = f->matching_signature(&parameters);
+   ir_function_signature *callee = f->matching_signature(&parameters);
    if (callee == NULL) {
       ir_read_error(st, list, "couldn't find matching signature for function "
                     "%s", name->value());