Mesa (master): vbo: stricter checks on Driver.NeedFlush
Keith Whitwell
keithw at kemper.freedesktop.org
Mon Mar 9 12:19:23 UTC 2009
Module: Mesa
Branch: master
Commit: 0756dc876c01a3d07da34e2da1899b340b0fb819
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0756dc876c01a3d07da34e2da1899b340b0fb819
Author: Keith Whitwell <keithw at vmware.com>
Date: Mon Mar 9 12:17:28 2009 +0000
vbo: stricter checks on Driver.NeedFlush
This variable is being used in the r300 driver to trigger a flush under
circumstances unrelated to the use in the vbo module. Tighten up the
checks in vbo so as to avoid conflict with r300.
Reported by Maciej Cencora <m.cencora at gmail.com>
---
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 a1e66ae..6402745 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;
}
More information about the mesa-commit
mailing list