diff options
| author | Michal Krol <michal@vmware.com> | 2009-03-15 10:22:35 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-03-15 10:23:15 +0100 |
| commit | 8ae04f3c46e7ac26a71e00759a2b25fd35a4d8d6 (patch) | |
| tree | 26df70597dd9dded3e7824e9c635939bea6476a3 /src/mesa/vbo/vbo_save_draw.c | |
| parent | 474399ddd635a2d90a6bcbf074c6c9a43b7cfd3b (diff) | |
| download | external_mesa3d-8ae04f3c46e7ac26a71e00759a2b25fd35a4d8d6.zip external_mesa3d-8ae04f3c46e7ac26a71e00759a2b25fd35a4d8d6.tar.gz external_mesa3d-8ae04f3c46e7ac26a71e00759a2b25fd35a4d8d6.tar.bz2 | |
vbo: Silence integer-to-pointer warnings.
Diffstat (limited to 'src/mesa/vbo/vbo_save_draw.c')
| -rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 617c5a7..f59e103 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; } } |