Huge dumb drop. State:

- Color buffer clear is accelerated, but flickers (possibly caused by a
  recent DDX or Mesa change or bad merge)
- Everything else uses software fallback rendering
- There should be no clipping-related artifacts with the
  sw-clipspan-fixes.patch against Mesa (posted on dri-devel)
- Multiple clients should be rock solid with a DDX patch that is soon to
  come (soon = within the next hour or so)

1 files changed, 7 insertions, 8 deletions

diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index b5fb20ddb4..79b7c5ada2 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_tex.h"
 #include "r200_state.h"
 #include "radeon_ioctl.h"
+#include "radeon_state.h"
 
 #if DEBUG_LOCKING
 char *prevLockFile = NULL;
@@ -70,7 +71,6 @@ static void radeonUpdatePageFlipping(radeonContextPtr radeon)
 static void r200RegainedLock(r200ContextPtr r200)
 {
 	__DRIdrawablePrivate *dPriv = r200->radeon.dri.drawable;
-	__DRIscreenPrivate *sPriv = r200->radeon.dri.screen;
 	int i;
 
 	if (r200->radeon.lastStamp != dPriv->lastStamp) {
@@ -83,9 +83,9 @@ static void r200RegainedLock(r200ContextPtr r200)
 			r200->radeon.state.color.drawPitch;
 
 		if (r200->radeon.glCtx->Color._DrawDestMask == DD_BACK_LEFT_BIT)
-			r200SetCliprects(r200, GL_BACK_LEFT);
+			radeonSetCliprects(&r200->radeon, GL_BACK_LEFT);
 		else
-			r200SetCliprects(r200, GL_FRONT_LEFT);
+			radeonSetCliprects(&r200->radeon, GL_FRONT_LEFT);
 		r200UpdateViewportOffset(r200->radeon.glCtx);
 		r200->radeon.lastStamp = dPriv->lastStamp;
 	}
@@ -98,17 +98,16 @@ static void r200RegainedLock(r200ContextPtr r200)
 static void r300RegainedLock(radeonContextPtr radeon)
 {
 	__DRIdrawablePrivate *dPriv = radeon->dri.drawable;
-	__DRIscreenPrivate *sPriv = radeon->dri.screen;
-	int i;
 
 	if (radeon->lastStamp != dPriv->lastStamp) {
 		radeonUpdatePageFlipping(radeon);
 
-#if 0
 		if (radeon->glCtx->Color._DrawDestMask == DD_BACK_LEFT_BIT)
-			r200SetCliprects(r200, GL_BACK_LEFT);
+			radeonSetCliprects(radeon, GL_BACK_LEFT);
 		else
-			r200SetCliprects(r200, GL_FRONT_LEFT);
+			radeonSetCliprects(radeon, GL_FRONT_LEFT);
+
+#if 0
 		r200UpdateViewportOffset(r200->radeon.glCtx);
 #endif
 		radeon->lastStamp = dPriv->lastStamp;