Mesa (master): r300g: typecast void* to unsigned correctly

Marek Olšák mareko at kemper.freedesktop.org
Sat Feb 12 22:40:30 UTC 2011


Module: Mesa
Branch: master
Commit: 685c3262b945a7f0e9f1f3a9409a12fdda08c828
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=685c3262b945a7f0e9f1f3a9409a12fdda08c828

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Feb 12 23:36:48 2011 +0100

r300g: typecast void* to unsigned correctly

---

 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 47d4f4d..2693043 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -314,14 +314,16 @@ static void radeon_bomgr_destroy(struct pb_manager *_mgr)
     FREE(mgr);
 }
 
+#define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x) & 0xffffffff))
+
 static unsigned handle_hash(void *key)
 {
-    return (unsigned)key;
+    return PTR_TO_UINT(key);
 }
 
 static int handle_compare(void *key1, void *key2)
 {
-    return !((int)key1 == (int)key2);
+    return PTR_TO_UINT(key1) == PTR_TO_UINT(key2);
 }
 
 struct pb_manager *radeon_bomgr_create(struct radeon_drm_winsys *rws)




More information about the mesa-commit mailing list