Mesa (master): st/draw: silence Mingw warning in pointer_to_offset()

Brian Paul brianp at kemper.freedesktop.org
Thu Oct 31 14:38:41 UTC 2013


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Oct 29 09:48:32 2013 -0600

st/draw: silence Mingw warning in pointer_to_offset()

Fixes "warning: cast from pointer to integer of different size" for
64-bit builds.

---

 src/mesa/state_tracker/st_draw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h
index 3313fc8..394473b 100644
--- a/src/mesa/state_tracker/st_draw.h
+++ b/src/mesa/state_tracker/st_draw.h
@@ -77,7 +77,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
 static INLINE unsigned
 pointer_to_offset(const void *ptr)
 {
-   return (unsigned) (((unsigned long) ptr) & 0xffffffffUL);
+   return (unsigned) (((GLsizeiptr) ptr) & 0xffffffffUL);
 }
 
 




More information about the mesa-commit mailing list