From 93102b4cd8e620337acf4bd42ba51f954664087e Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Tue, 23 Nov 2010 08:52:23 +0800 Subject: mesa: fix regression from b4bb6680200b5a898583392f4c831c02f41e63f7 Pending commands to the previous context aren't flushed since commit b4bb668 Reported-by: Oleksiy Krivoshey Signed-off-by: Xiang, Haihao --- src/mesa/main/context.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') 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); -- cgit v1.2.3