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

mesa: fix some VBO buffer object issues

Browse source 
The VBO module may use a real VBO or a malloc'd buffer for vertex storage.
Be careful not to accidentally replace the later with the former when drawing.
Check if using a real VBO at destroy time to prevent a double-free.
This commit is contained in:
Brian Paul 2008-09-25 11:03:46 -06:00
parent 507ef82077
commit 6222eb3fcd
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -699,8 +699,8 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
&exec->vtx.bufferobj,
ctx->Array.NullBufferObj);
ASSERT(!exec->vtx.buffer_map);
exec->vtx.buffer_map = ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE * sizeof(GLfloat), 64);
vbo_exec_vtxfmt_init( exec );
/* Hook our functions into the dispatch table.
@ -725,9 +725,17 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
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;
if (exec->vtx.bufferobj->Name) {
/* using a real VBO for vertex data */
GLcontext *ctx = exec->ctx;
_mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);
}
else {
/* just using malloc'd space for vertex data */
if (exec->vtx.buffer_map) {
ALIGN_FREE(exec->vtx.buffer_map);
exec->vtx.buffer_map = NULL;
}
}
}

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

@ -242,8 +242,11 @@ void vbo_exec_vtx_flush( struct vbo_exec_context *exec )
*/
vbo_exec_bind_arrays( ctx );
ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);
exec->vtx.buffer_map = NULL;
/* if using a real VBO, unmap it before drawing */
if (exec->vtx.bufferobj->Name) {
ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);
exec->vtx.buffer_map = NULL;
}
vbo_context(ctx)->draw_prims( ctx,
exec->vtx.inputs,
@ -253,11 +256,12 @@ void vbo_exec_vtx_flush( struct vbo_exec_context *exec )
0,
exec->vtx.vert_count - 1);
/* Get new data:
*/
ctx->Driver.BufferData(ctx, target, size, NULL, usage, exec->vtx.bufferobj);
exec->vtx.buffer_map
= ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);
/* If using a real VBO, get new storage */
if (exec->vtx.bufferobj->Name) {
ctx->Driver.BufferData(ctx, target, size, NULL, usage, exec->vtx.bufferobj);
exec->vtx.buffer_map =
ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);
}
}
}