diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-04-21 16:55:57 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-04-22 09:03:17 +0100 |
| commit | 009749b4a8c3ec54f47f3f85552e5ae275ab6ae6 (patch) | |
| tree | d41cb5a617bc77b10917cb8a444b59e0053d862b /src/mesa/main/context.c | |
| parent | c1a3b852807fb160f0cd246c1364b7336b4b947e (diff) | |
mesa: protect driver.flush() with FLUSH_CURRENT
Need to do this to ensure vbo code unmaps its buffers before calling
the driver, which may be sitting on top of a memory manager which
objects to firing commands from a mapped buffer.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4cff36adfa..5726dbd983 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -187,7 +187,7 @@ GLfloat _mesa_ubyte_to_float_color_tab[256]; void _mesa_notifySwapBuffers(__GLcontext *ctx) { - FLUSH_VERTICES( ctx, 0 ); + FLUSH_CURRENT( ctx, 0 ); if (ctx->Driver.Flush) { ctx->Driver.Flush(ctx); } @@ -1514,6 +1514,7 @@ _mesa_Flush(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + FLUSH_CURRENT( ctx, 0 ); if (ctx->Driver.Flush) { ctx->Driver.Flush(ctx); } |