From 9f9386d22aca8d14d1b1e6d4de9b24dcb183ca10 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Aug 2010 14:04:51 -0600
Subject: [PATCH] glsl2: added casts to silence warnings

---
 src/glsl/glsl_types.cpp   |  4 ++--
 src/glsl/ir_dead_code.cpp |  6 +++---
 src/glsl/ir_validate.cpp  | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 9b1bef6cb85..2aba1e0ac1d 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -400,7 +400,7 @@ glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
     * named 'foo'.
     */
    char key[128];
-   snprintf(key, sizeof(key), "%p[%u]", base, array_size);
+   snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size);
 
    const glsl_type *t = (glsl_type *) hash_table_find(array_types, key);
    if (t == NULL) {
@@ -458,7 +458,7 @@ glsl_type::record_key_hash(const void *a)
 	 break;
 
       size += snprintf(& hash_key[size], sizeof(hash_key) - size,
-		       "%p", key->fields.structure[i].type);
+		       "%p", (void *) key->fields.structure[i].type);
    }
 
    return hash_table_string_hash(& hash_key);
diff --git a/src/glsl/ir_dead_code.cpp b/src/glsl/ir_dead_code.cpp
index 87988871c7e..fce921262f4 100644
--- a/src/glsl/ir_dead_code.cpp
+++ b/src/glsl/ir_dead_code.cpp
@@ -64,7 +64,7 @@ do_dead_code(exec_list *instructions)
 
       if (debug) {
 	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",
-		entry->var->name, entry->var,
+		entry->var->name, (void *) entry->var,
 		entry->referenced_count, entry->assigned_count,
 		entry->declaration ? "" : "not ");
       }
@@ -85,7 +85,7 @@ do_dead_code(exec_list *instructions)
 
 	    if (debug) {
 	       printf("Removed assignment to %s@%p\n",
-		      entry->var->name, entry->var);
+		      entry->var->name, (void *) entry->var);
 	    }
 	 }
       } else {
@@ -97,7 +97,7 @@ do_dead_code(exec_list *instructions)
 
 	 if (debug) {
 	    printf("Removed declaration of %s@%p\n",
-		   entry->var->name, entry->var);
+		   entry->var->name, (void *) entry->var);
 	 }
       }
    }
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 545fe2799f3..6e08fa4025a 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -82,14 +82,14 @@ ir_validate::visit(ir_dereference_variable *ir)
 {
    if ((ir->var == NULL) || (ir->var->as_variable() == NULL)) {
       printf("ir_dereference_variable @ %p does not specify a variable %p\n",
-	     ir, ir->var);
+	     (void *) ir, (void *) ir->var);
       abort();
    }
 
    if (hash_table_find(ht, ir->var) == NULL) {
       printf("ir_dereference_variable @ %p specifies undeclared variable "
 	     "`%s' @ %p\n",
-	     ir, ir->var->name, ir->var);
+	     (void *) ir, ir->var->name, (void *) ir->var);
       abort();
    }
 
@@ -122,8 +122,8 @@ ir_validate::visit_enter(ir_function *ir)
       printf("Function definition nested inside another function "
 	     "definition:\n");
       printf("%s %p inside %s %p\n",
-	     ir->name, ir,
-	     this->current_function->name, this->current_function);
+	     ir->name, (void *) ir,
+	     this->current_function->name, (void *) this->current_function);
       abort();
    }
 
@@ -154,9 +154,9 @@ ir_validate::visit_enter(ir_function_signature *ir)
       printf("Function signature nested inside wrong function "
 	     "definition:\n");
       printf("%p inside %s %p instead of %s %p\n",
-	     ir,
-	     this->current_function->name, this->current_function,
-	     ir->function_name(), ir->function());
+	     (void *) ir,
+	     this->current_function->name, (void *) this->current_function,
+	     ir->function_name(), (void *) ir->function());
       abort();
    }
 
-- 
2.30.2