r300: Also update window state when it's already bound but its stamp changed.

And set new cliprects before deriving other state from them. This ensures
cliprects aren't accessed after having been freed.

Thanks to Panagiotis Papadakos for testing various iterations of this.

diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index d66f1dc49e88d1a4816773b75575d2b1c03f1c4b..66d1b153b3c1c9da5785cb86c14ff9fdc7e42861 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -273,15 +273,15 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
                                              &radeon->vbl_seq);
                }
 
+               radeon->dri.readable = driReadPriv;
+
                if (radeon->dri.drawable != driDrawPriv ||
-                   radeon->dri.readable != driReadPriv) {
+                   radeon->lastStamp != driDrawPriv->lastStamp) {
                        radeon->dri.drawable = driDrawPriv;
-                       radeon->dri.readable = driReadPriv;
 
+                       radeonSetCliprects(radeon);
                        r300UpdateWindow(radeon->glCtx);
                        r300UpdateViewportOffset(radeon->glCtx);
-
-                       radeonSetCliprects(radeon);
                }
 
                _mesa_make_current(radeon->glCtx,