From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 12 Sep 2010 14:01:41 +0000 (+0100)
Subject: llvmpipe: fix warnings on both 32 and 64 bit builds
X-Git-Tag: android-x86-2.2~1249
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4b99b9f5ff8e55252be7cd6dcc2e9fda24561ea3;p=android-x86%2Fexternal-mesa.git

llvmpipe: fix warnings on both 32 and 64 bit builds
---

diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h
index fff849fe518..dbef7692e42 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene.h
@@ -50,7 +50,7 @@ struct lp_scene_queue;
 
 
 #define CMD_BLOCK_MAX 128
-#define DATA_BLOCK_SIZE (64 * 1024 - 2 * sizeof(void *))
+#define DATA_BLOCK_SIZE (64 * 1024)
 
 /* Scene temporary storage is clamped to this size:
  */
@@ -207,7 +207,7 @@ lp_scene_alloc( struct lp_scene *scene, unsigned size)
    assert(block != NULL);
 
    if (LP_DEBUG & DEBUG_MEM)
-      debug_printf("alloc %u block %u/%lu tot %u/%u\n",
+      debug_printf("alloc %u block %u/%u tot %u/%u\n",
 		   size, block->used, DATA_BLOCK_SIZE,
 		   scene->scene_size, LP_SCENE_MAX_SIZE);
 
@@ -240,7 +240,7 @@ lp_scene_alloc_aligned( struct lp_scene *scene, unsigned size,
    assert(block != NULL);
 
    if (LP_DEBUG & DEBUG_MEM)
-      debug_printf("alloc %u block %u/%lu tot %u/%u\n",
+      debug_printf("alloc %u block %u/%u tot %u/%u\n",
 		   size + alignment - 1,
 		   block->used, DATA_BLOCK_SIZE,
 		   scene->scene_size, LP_SCENE_MAX_SIZE);