mesa: Branch 'master'

[Michel Daenzer]

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

New commits:
diff-tree 6f9b1afc862851532e4820705c412388b497ad58 (from 1c70cde8881f794782780cbd695da0882f78c769)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Mar 6 13:22:35 2007 +0100

    r300: Call radeonSetCliprects from radeonMakeCurrent.
    
    Based on a patch by Panagiotis Papadakos.
    
    Among other things, this makes sure the framebuffer object associated with the
    drawable has the correct size when _mesa_make_current is called, so the default
    viewport is set up correctly.
    
    Also update radeon->lastStamp in radeonSetCliprects.

diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 3a6bde8..d66f1dc 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -51,6 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
 #include "radeon_macros.h"
 #include "radeon_reg.h"
 
+#include "radeon_state.h"
 #include "r300_state.h"
 
 #include "utils.h"
@@ -279,6 +280,8 @@ GLboolean radeonMakeCurrent(__DRIcontext
 
 			r300UpdateWindow(radeon->glCtx);
 			r300UpdateViewportOffset(radeon->glCtx);
+
+			radeonSetCliprects(radeon);
 		}
 
 		_mesa_make_current(radeon->glCtx,
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index a00da6c..1a2dfca 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -90,7 +90,6 @@ static void r300RegainedLock(radeonConte
 #else
 		radeonUpdateScissor(radeon->glCtx);
 #endif
-		radeon->lastStamp = drawable->lastStamp;
 	}
 
 	if (sarea->ctx_owner != radeon->dri.hwContext) {
diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c
index ddadf83..902e958 100644
--- a/src/mesa/drivers/dri/r300/radeon_state.c
+++ b/src/mesa/drivers/dri/r300/radeon_state.c
@@ -185,6 +185,8 @@ void radeonSetCliprects(radeonContextPtr
 
 	if (radeon->state.scissor.enabled)
 		radeonRecalcScissorRects(radeon);
+
+	radeon->lastStamp = drawable->lastStamp;
 }