Demos (master): Add casts to int -> ptr conversion, to silence warnings.

[Jose Fonseca]

Module: Demos
Branch: master
Commit: de75383f8f3a889b01ae0d54a4eefdd3ac57c81e
URL:    
http://cgit.freedesktop.org/mesa/demos/commit/?id=de75383f8f3a889b01ae0d54a4eefdd3ac57c81e

Author: José Fonseca <jfons...@vmware.com>
Date:   Tue May 10 11:43:42 2011 +0100

Add casts to int -> ptr conversion, to silence warnings.

---

 src/objviewer/glmdraw.c |    6 +++---
 src/tests/bufferobj.c   |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/objviewer/glmdraw.c b/src/objviewer/glmdraw.c
index b9d8813..2f73f04 100644
--- a/src/objviewer/glmdraw.c
+++ b/src/objviewer/glmdraw.c
@@ -258,18 +258,18 @@ glmDrawVBO(GLMmodel *model)
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, model->vbo);
 
    glVertexPointer(3, GL_FLOAT, model->vertexSize * sizeof(float),
-                   (void *) model->posOffset);
+                   (const void *) (size_t) model->posOffset);
    glEnableClientState(GL_VERTEX_ARRAY);
 
    if (model->numnormals > 0) {
       glNormalPointer(GL_FLOAT, model->vertexSize * sizeof(float),
-                      (void *) model->normOffset);
+                      (const void *) (size_t) model->normOffset);
       glEnableClientState(GL_NORMAL_ARRAY);
    }
 
    if (model->numtexcoords > 0) {
       glTexCoordPointer(2, GL_FLOAT, model->vertexSize * sizeof(float),
-                        (void *) model->texOffset);
+                        (const void *) (size_t) model->texOffset);
       glEnableClientState(GL_TEXTURE_COORD_ARRAY);
    }
 
diff --git a/src/tests/bufferobj.c b/src/tests/bufferobj.c
index dc479af..fe7e61b 100644
--- a/src/tests/bufferobj.c
+++ b/src/tests/bufferobj.c
@@ -74,7 +74,7 @@ static void DrawObject( const struct object *obj )
       /* no vertex array objects, must set vertex/color pointers per draw */
 
       glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
-      glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) 
obj->VertexOffset);
+      glVertexPointer(3, GL_FLOAT, obj->VertexStride, (const void *) (size_t) 
obj->VertexOffset);
       glEnableClientState(GL_VERTEX_ARRAY);
 
       /* test push/pop attrib */
@@ -83,13 +83,13 @@ static void DrawObject( const struct object *obj )
       if (1)
       {
          glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
-         /*glVertexPointer(3, GL_FLOAT, 0, (void *) (obj->VertexOffset + 
10000));*/
+         /*glVertexPointer(3, GL_FLOAT, 0, (const void *) (size_t) 
(obj->VertexOffset + 10000));*/
          glBindBufferARB(GL_ARRAY_BUFFER_ARB, 999999);
          glPopClientAttrib();
       }
 #endif
       glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
-      glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
+      glColorPointer(3, GL_FLOAT, obj->ColorStride, (const void *) (size_t) 
obj->ColorOffset);
       glEnableClientState(GL_COLOR_ARRAY);
 
       if (obj->NumElements > 0) {
@@ -224,11 +224,11 @@ CreateVertexArrayObject(struct object *obj)
    glBindVertexArray(obj->ArrayObjectID);
 
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
-   glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) obj->VertexOffset);
+   glVertexPointer(3, GL_FLOAT, obj->VertexStride, (const void *) (size_t) 
obj->VertexOffset);
    glEnableClientState(GL_VERTEX_ARRAY);
 
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
-   glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
+   glColorPointer(3, GL_FLOAT, obj->ColorStride, (const void *) (size_t) 
obj->ColorOffset);
    glEnableClientState(GL_COLOR_ARRAY);
 
    glBindVertexArray(0);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit