summaryrefslogtreecommitdiff
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2010-11-23 08:52:23 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2010-11-23 08:59:44 +0800
commit93102b4cd8e620337acf4bd42ba51f954664087e (patch)
tree292d6a14ad95175733e7f8f19e648b0c41e5e3d2 /src/mesa/main/context.c
parentcb7a36b6512f52abcb9161e06a69d43baf05a490 (diff)
mesa: fix regression from b4bb6680200b5a898583392f4c831c02f41e63f7
Pending commands to the previous context aren't flushed since commit b4bb668 Reported-by: Oleksiy Krivoshey <oleksiyk@gmail.com> Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b132030b9b..4ed179a834 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1399,6 +1399,8 @@ _mesa_make_current( struct gl_context *newCtx,
struct gl_framebuffer *drawBuffer,
struct gl_framebuffer *readBuffer )
{
+ GET_CURRENT_CONTEXT(curCtx);
+
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(newCtx, "_mesa_make_current()\n");
@@ -1419,6 +1421,11 @@ _mesa_make_current( struct gl_context *newCtx,
}
}
+ if (curCtx &&
+ (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && /* make sure this context is valid for flushing */
+ curCtx != newCtx)
+ _mesa_flush(curCtx);
+
/* We used to call _glapi_check_multithread() here. Now do it in drivers */
_glapi_set_context((void *) newCtx);
ASSERT(_mesa_get_current_context() == newCtx);