1 files changed, 3 insertions, 28 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index dde615a4d9..330c2c8a86 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -481,32 +481,6 @@ void radeonCopyBuffer( __DRIdrawablePrivate *dPriv,
 		if (!n)
 			continue;
 
-		if (IS_R600_CLASS(rmesa->radeonScreen)) {
-			int cpp = rmesa->radeonScreen->cpp;
-			int src_pitch = rmesa->radeonScreen->backPitch * cpp;
-			int dst_pitch = rmesa->radeonScreen->frontPitch * cpp;
-			char *src = (char *)rmesa->radeonScreen->driScreen->pFB + rmesa->radeonScreen->backOffset;
-			char *dst = (char *)rmesa->radeonScreen->driScreen->pFB + rmesa->radeonScreen->frontOffset;
-			int j;
-			drm_clip_rect_t *pb = rmesa->sarea->boxes;
-
-			for (j = 0; j < n; j++) {
-				int x = pb[j].x1;
-				int y = pb[j].y1;
-				int w = pb[j].x2 - x;
-				int h = pb[j].y2 - y;
-
-				src += (y * src_pitch) + (x * cpp);
-				dst += (y * dst_pitch) + (x * cpp);
-
-				while (h--) {
-					memcpy(dst, src, w * cpp);
-					src += src_pitch;
-					dst += dst_pitch;
-				}
-			}
-		}
-
 		ret = drmCommandNone( rmesa->dri.fd, DRM_RADEON_SWAP );
 
 		if ( ret ) {
@@ -887,10 +861,11 @@ void radeonUpdatePageFlipping(radeonContextPtr radeon)
 
 void radeon_window_moved(radeonContextPtr radeon)
 {
+	/* Cliprects has to be updated before doing anything else */
+	radeonSetCliprects(radeon);
 	if (!radeon->radeonScreen->driScreen->dri2.enabled) {
 		radeonUpdatePageFlipping(radeon);
 	}
-	radeonSetCliprects(radeon);
 }
 
 void radeon_viewport(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height)
@@ -1092,7 +1067,7 @@ void radeonFlush(GLcontext *ctx)
 			 * each of N places that do rendering.  This has worse performances,
 			 * but it is much easier to get correct.
 			 */
-			if (radeon->is_front_buffer_rendering) {
+			if (!radeon->is_front_buffer_rendering) {
 				radeon->front_buffer_dirty = GL_FALSE;
 			}
 		}