diff options
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index a1e66aec63..6402745ab6 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -748,7 +748,7 @@ void vbo_exec_BeginVertices( GLcontext *ctx ) if (0) _mesa_printf("%s\n", __FUNCTION__); vbo_exec_vtx_map( exec ); - assert(exec->ctx->Driver.NeedFlush == 0); + assert((exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0); exec->ctx->Driver.NeedFlush = FLUSH_UPDATE_CURRENT; } @@ -783,10 +783,12 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags ) /* Need to do this to ensure BeginVertices gets called again: */ - _mesa_restore_exec_vtxfmt( ctx ); + if (flags & FLUSH_UPDATE_CURRENT) { + assert(exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT); + _mesa_restore_exec_vtxfmt( ctx ); + } - assert(exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT); - exec->ctx->Driver.NeedFlush = 0; + exec->ctx->Driver.NeedFlush &= ~flags; } |