diff options
author | José Fonseca <[email protected]> | 2010-04-24 16:13:41 +0100 |
---|---|---|
committer | José Fonseca <[email protected]> | 2010-04-24 16:13:41 +0100 |
commit | ee15d5a0c40b252670ec9e261460bad82402443d (patch) | |
tree | 719ce93babc3261cea9a98728bf49733b1eb6a5a | |
parent | aa7a47dcbdfff3c6858ff3618170ec17ca72d337 (diff) |
util: Fix unsigned <-> ptr conversions.
-rw-r--r-- | src/gallium/auxiliary/util/u_surfaces.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_surfaces.c b/src/gallium/auxiliary/util/u_surfaces.c index 0248120f557..668da8c5c27 100644 --- a/src/gallium/auxiliary/util/u_surfaces.c +++ b/src/gallium/auxiliary/util/u_surfaces.c @@ -9,13 +9,13 @@ static unsigned hash(void *key) { - return (unsigned)key; + return (unsigned)(uintptr_t)key; } static int compare(void *key1, void *key2) { - return (unsigned)key1 - (unsigned)key2; + return (unsigned)(uintptr_t)key1 - (unsigned)(uintptr_t)key2; } struct pipe_surface * @@ -67,7 +67,7 @@ util_surfaces_do_detach(struct util_surfaces *us, struct pipe_surface *ps) struct pipe_resource *pt = ps->texture; if(pt->target == PIPE_TEXTURE_3D || pt->target == PIPE_TEXTURE_CUBE) { /* or 2D array */ - void* key = (void*)(((ps->zslice + ps->face) << 8) | ps->level); + void* key = (void*)(uintptr_t)(((ps->zslice + ps->face) << 8) | ps->level); util_hash_table_remove(us->u.table, key); } else |