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

This reverts commit 286bf89e5a1fc931dbf523ded861b809859485e2.

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

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 1fd32d497b4a5d2a89743cdb729647b001e47e3b..ac20c08e201a4fcd8fe702c0433ff98363336a89 100644 (file)
--- 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 3b4366aa61ca6818a8fa250942d425423f86c2ef..184287aa44cab5ceb0339120d688edbee85f1ae8 100644 (file)
--- 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);
        }
 }