diff options
| author | Keith Whitwell <[email protected]> | 2009-03-04 16:09:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-03-04 16:09:14 +0000 |
| commit | fba923ff4415ce8a14c890dea65bcb07b2f87fb5 (patch) | |
| tree | f51a384cf89555cf4898f89483cff8a3ed45fba2 /src/mesa/vbo/vbo_exec_draw.c | |
| parent | 579ef8ab1984d895867f547afa60b3bec4c4599a (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/mesa/vbo/vbo_exec_draw.c')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_draw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 4b44b30b325..38b6c56f479 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); } |