Mesa (mesa_7_7_branch): Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"

Dave Airlie airlied at kemper.freedesktop.org
Tue Dec 1 17:04:37 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: e84dddde9b6eb7727760814ae211c95218bb28a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e84dddde9b6eb7727760814ae211c95218bb28a3

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec  2 11:01:19 2009 +1000

Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"

This reverts commit 286bf89e5a1fc931dbf523ded861b809859485e2.

This doesn't appear to be correct, regression so revert it.
http://bugs.freedesktop.org/show_bug.cgi?id=25193

---

 src/mesa/drivers/dri/r300/r300_state.c      |    3 +--
 src/mesa/drivers/dri/radeon/radeon_common.c |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 1fd32d4..ac20c08 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1741,8 +1741,7 @@ static void r300Enable(GLcontext * ctx, GLenum cap, GLboolean state)
 		r300SetPolygonOffsetState(ctx, state);
 		break;
 	case GL_SCISSOR_TEST:
-		if (!rmesa->radeon.radeonScreen->kernel_mm)
-			radeon_firevertices(&rmesa->radeon);
+		radeon_firevertices(&rmesa->radeon);
 		rmesa->radeon.state.scissor.enabled = state;
 		radeonUpdateScissor( ctx );
 		break;
diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 3b4366a..184287a 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -257,9 +257,7 @@ void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h)
 	radeonContextPtr radeon = RADEON_CONTEXT(ctx);
 	if (ctx->Scissor.Enabled) {
 		/* We don't pipeline cliprect changes */
-		if (!radeon->radeonScreen->kernel_mm) {
-			radeon_firevertices(radeon);
-		}
+		radeon_firevertices(radeon);
 		radeonUpdateScissor(ctx);
 	}
 }



More information about the mesa-commit mailing list