From: Henri Verbeet <hverbeet@gmail.com>
Date: Thu, 15 Jul 2010 18:53:16 +0000 (-0400)
Subject: radeon: Also flush if it's not the current context that's being destroyed.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fef9b532cd1631cc53056b9eba4369d1310b88df;p=mesa.git

radeon: Also flush if it's not the current context that's being destroyed.

This avoids calling radeonFlush() during context destruction, when
ctx->DrawBuffer would be NULL.

NOTE: This is a candidate for the 7.8 branch.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 94f476617b6..5a7d52c4d2f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -300,10 +300,10 @@ void radeonDestroyContext(__DRIcontext *driContextPriv )
 	_mesa_meta_free(radeon->glCtx);
 
 	if (radeon == current) {
-		radeon_firevertices(radeon);
 		_mesa_make_current(NULL, NULL, NULL);
 	}
 
+	radeon_firevertices(radeon);
 	if (!is_empty_list(&radeon->dma.reserved)) {
 		rcommonFlushCmdBuf( radeon, __FUNCTION__ );
 	}