diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-03-03 11:51:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-03-03 11:51:14 +0000 |
| commit | 916de35d677ca5238e9515840fa5aa9f81302c5b (patch) | |
| tree | 73a8a2443c3de43d253a38528335e39b40b391dc /src/mesa/vbo/vbo_save.h | |
| parent | 72cf6e8e92e49753472e760b1cf4575327b48f43 (diff) | |
| parent | 2785af803f7d6d64ff17c10645e5f10499289ed0 (diff) | |
| download | external_mesa3d-916de35d677ca5238e9515840fa5aa9f81302c5b.zip external_mesa3d-916de35d677ca5238e9515840fa5aa9f81302c5b.tar.gz external_mesa3d-916de35d677ca5238e9515840fa5aa9f81302c5b.tar.bz2 | |
Merge commit 'origin/gallium-0.1'
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/include/pipe/p_defines.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/vbo/vbo_save.h')
| -rw-r--r-- | src/mesa/vbo/vbo_save.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 7dda54a..9558f83 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -130,7 +130,7 @@ struct vbo_save_context { struct vbo_save_vertex_store *vertex_store; struct vbo_save_primitive_store *prim_store; - GLfloat *vbptr; /* cursor, points into buffer */ + GLfloat *buffer_ptr; /* cursor, points into buffer */ GLfloat vertex[VBO_ATTRIB_MAX*4]; /* current values */ GLfloat *attrptr[VBO_ATTRIB_MAX]; GLuint vert_count; |