fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 06:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "vbo: avoid getting buffer_ptr and buffer_map out of sync"

Browse source 
This fixed a minor bug but broke everything else.

This reverts commit 579ef8ab19.
This commit is contained in:
Keith Whitwell 2009-03-04 16:09:14 +00:00
parent 579ef8ab19
commit fba923ff44
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/vbo/vbo_exec_api.c
View file

@ -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;
}
}
}

6
src/mesa/vbo/vbo_exec_draw.c
View file

@ -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);
}