mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/r300/radeon_lock.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 65faf023679988f93da82b4c7ebdc689f2094459 (from c409dbcae3607e6f83f50a28d9bbb51f5ad51be4)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Apr 30 18:28:24 2007 +0200

    r300: Don't crash in radeonUpdatePageFlipping when !radeon->glCtx->DrawBuffer.
    
    This feels like a kludge, maybe there's a better solution.

diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index 84181e2..0d0d9ab 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -60,7 +60,9 @@ void radeonUpdatePageFlipping(radeonCont
            r300UpdateDrawBuffer(radeon->glCtx);
         }
 
-	use_back = (radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT);
+	use_back = radeon->glCtx->DrawBuffer ?
+		(radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] ==
+		 BUFFER_BIT_BACK_LEFT) : 1;
 	use_back ^= (radeon->sarea->pfCurrentPage == 1);
 
 	if (use_back) {