summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-09-12 15:01:41 +0100
committerKeith Whitwell <[email protected]>2010-09-12 15:01:41 +0100
commit4b99b9f5ff8e55252be7cd6dcc2e9fda24561ea3 (patch)
tree4946b1ff098df361ff81e87a82ced0d6a1985561 /src
parent51b1d4f03c78251851b6f29aae93ea5c4a0f184c (diff)
llvmpipe: fix warnings on both 32 and 64 bit builds
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_scene.h6
1 files changed, 3 insertions, 3 deletions
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);