mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-24 03:50:32 +01:00
vbo: use FLUSH_UPDATE_CURRENT flag to indicate whether the vbo module is active
Add asserts for expected values on wakeup and flush. Remove cases where this flag is set or cleared except when waking up and flushing vbo module.
This commit is contained in:
parent
945dcbfca6
commit
f9ce417aaf
1 changed files with 4 additions and 6 deletions
|
|
@ -183,8 +183,6 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec )
|
|||
_mesa_update_color_material(ctx,
|
||||
ctx->Current.Attrib[VBO_ATTRIB_COLOR0]);
|
||||
}
|
||||
|
||||
ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -204,8 +202,6 @@ static void vbo_exec_copy_from_current( struct vbo_exec_context *exec )
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -346,8 +342,6 @@ static void vbo_exec_fixup_vertex( GLcontext *ctx,
|
|||
*/
|
||||
if (attr == 0)
|
||||
exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
|
||||
else
|
||||
exec->ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -750,6 +744,9 @@ void vbo_exec_BeginVertices( GLcontext *ctx )
|
|||
struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
|
||||
if (0) _mesa_printf("%s\n", __FUNCTION__);
|
||||
vbo_exec_vtx_map( exec );
|
||||
|
||||
assert(exec->ctx->Driver.NeedFlush == 0);
|
||||
exec->ctx->Driver.NeedFlush = FLUSH_UPDATE_CURRENT;
|
||||
}
|
||||
|
||||
void vbo_exec_FlushVertices_internal( GLcontext *ctx, GLboolean unmap )
|
||||
|
|
@ -785,6 +782,7 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
|
|||
*/
|
||||
_mesa_restore_exec_vtxfmt( ctx );
|
||||
|
||||
assert(exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT);
|
||||
exec->ctx->Driver.NeedFlush = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue