From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Thu, 5 Mar 2009 19:01:03 +0000 (-0800)
Subject: r300-gallium: Move scissor state.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ac2acda036c208d963fefac27d7300e017c74527;p=mesa.git

r300-gallium: Move scissor state.

Keep it grouped with all the other parameterized state.
---

diff --git a/src/gallium/drivers/r300/r300_surface.c b/src/gallium/drivers/r300/r300_surface.c
index c2fd744e426..1913ffce1ea 100644
--- a/src/gallium/drivers/r300/r300_surface.c
+++ b/src/gallium/drivers/r300/r300_surface.c
@@ -185,11 +185,6 @@ static void r300_surface_fill(struct pipe_context* pipe,
     /* XXX */
     OUT_CS_REG(R300_SC_CLIP_RULE, 0xaaaa);
 
-    /* Pixel scissors */
-    OUT_CS_REG_SEQ(R300_SC_SCISSORS_TL, 2);
-    OUT_CS((x << R300_SCISSORS_X_SHIFT) | (y << R300_SCISSORS_Y_SHIFT));
-    OUT_CS((w << R300_SCISSORS_X_SHIFT) | (h << R300_SCISSORS_Y_SHIFT));
-
     /* RS block setup */
     if (caps->is_r500) {
         /* XXX We seem to be in disagreement about how many of these we have
@@ -264,6 +259,11 @@ static void r300_surface_fill(struct pipe_context* pipe,
     }
     END_CS;
 
+    /* Pixel scissors */
+    OUT_CS_REG_SEQ(R300_SC_SCISSORS_TL, 2);
+    OUT_CS((x << R300_SCISSORS_X_SHIFT) | (y << R300_SCISSORS_Y_SHIFT));
+    OUT_CS((w << R300_SCISSORS_X_SHIFT) | (h << R300_SCISSORS_Y_SHIFT));
+
     /* The size of the point we're about to draw, in sixths of pixels */
     OUT_CS_REG(R300_GA_POINT_SIZE,
         ((h * 6) & R300_POINTSIZE_Y_MASK) |