From: Michal Krol <michal@vmware.com>
Date: Sun, 15 Mar 2009 09:22:35 +0000 (+0100)
Subject: vbo: Silence integer-to-pointer warnings.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ae04f3c46e7ac26a71e00759a2b25fd35a4d8d6;p=mesa.git

vbo: Silence integer-to-pointer warnings.
---

diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 617c5a77baf..f59e1036d01 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -115,7 +115,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
    struct gl_client_array *arrays = save->arrays;
-   GLuint data = node->buffer_offset;
+   GLuint buffer_offset = node->buffer_offset;
    const GLuint *map;
    GLuint attr;
    GLubyte node_attrsz[VBO_ATTRIB_MAX];  /* copy of node->attrsz[] */
@@ -170,7 +170,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
          /* override the default array set above */
          save->inputs[attr] = &arrays[attr];
 
-	 arrays[attr].Ptr = (const GLubyte *) data;
+	 arrays[attr].Ptr = (const GLubyte *) NULL + buffer_offset;
 	 arrays[attr].Size = node->attrsz[src];
 	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
 	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
@@ -184,7 +184,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
 	 
 	 assert(arrays[attr].BufferObj->Name);
 
-	 data += node->attrsz[src] * sizeof(GLfloat);
+	 buffer_offset += node->attrsz[src] * sizeof(GLfloat);
          varying_inputs |= 1<<attr;
       }
    }