diff options
| author | Corbin Simpson <[email protected]> | 2009-03-05 11:01:03 -0800 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2009-03-05 12:41:54 -0800 |
| commit | ac2acda036c208d963fefac27d7300e017c74527 (patch) | |
| tree | d7fc6a7469d61148d30a46a1a6ba21d36e5723ce /src | |
| parent | 626ac953354156f2545d90960f6712a2248ba795 (diff) | |
r300-gallium: Move scissor state.
Keep it grouped with all the other parameterized state.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r300/r300_surface.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |