summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-03-04 16:09:14 +0000
committerKeith Whitwell <keithw@vmware.com>2009-03-04 16:09:14 +0000
commitfba923ff4415ce8a14c890dea65bcb07b2f87fb5 (patch)
treef51a384cf89555cf4898f89483cff8a3ed45fba2 /src
parent579ef8ab1984d895867f547afa60b3bec4c4599a (diff)
Revert "vbo: avoid getting buffer_ptr and buffer_map out of sync"
This fixed a minor bug but broke everything else. This reverts commit 579ef8ab1984d895867f547afa60b3bec4c4599a.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/vbo/vbo_exec_api.c3
-rw-r--r--src/mesa/vbo/vbo_exec_draw.c6
2 files changed, 1 insertions, 8 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index a1e66aec63..9c2d065913 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -675,7 +675,6 @@ void vbo_use_buffer_objects(GLcontext *ctx)
if (exec->vtx.buffer_map) {
_mesa_align_free(exec->vtx.buffer_map);
exec->vtx.buffer_map = NULL;
- exec->vtx.buffer_ptr = NULL;
}
/* Allocate a real buffer object now */
@@ -701,7 +700,6 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
ASSERT(!exec->vtx.buffer_map);
exec->vtx.buffer_map = (GLfloat *)ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE, 64);
- exec->vtx.buffer_ptr = exec->vtx.buffer_map;
vbo_exec_vtxfmt_init( exec );
@@ -737,7 +735,6 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
if (exec->vtx.buffer_map) {
ALIGN_FREE(exec->vtx.buffer_map);
exec->vtx.buffer_map = NULL;
- exec->vtx.buffer_ptr = NULL;
}
}
}
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 4b44b30b32..38b6c56f47 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -243,10 +243,7 @@ static void vbo_exec_vtx_unmap( struct vbo_exec_context *exec )
exec->vtx.buffer_used += (exec->vtx.buffer_ptr -
exec->vtx.buffer_map) * sizeof(float);
-
-
- assert(exec->vtx.buffer_ptr != NULL);
-
+
ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);
exec->vtx.buffer_map = NULL;
exec->vtx.buffer_ptr = NULL;
@@ -299,7 +296,6 @@ void vbo_exec_vtx_map( struct vbo_exec_context *exec )
(GLfloat *)ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);
}
- exec->vtx.buffer_ptr = exec->vtx.buffer_map;
if (0) _mesa_printf("map %d..\n", exec->vtx.buffer_used);
}