r300-gallium: Move scissor state.
Keep it grouped with all the other parameterized state.
This commit is contained in:
parent
626ac95335
commit
ac2acda036
|
@ -185,11 +185,6 @@ static void r300_surface_fill(struct pipe_context* pipe,
|
||||||
/* XXX */
|
/* XXX */
|
||||||
OUT_CS_REG(R300_SC_CLIP_RULE, 0xaaaa);
|
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 */
|
/* RS block setup */
|
||||||
if (caps->is_r500) {
|
if (caps->is_r500) {
|
||||||
/* XXX We seem to be in disagreement about how many of these we have
|
/* 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;
|
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 */
|
/* The size of the point we're about to draw, in sixths of pixels */
|
||||||
OUT_CS_REG(R300_GA_POINT_SIZE,
|
OUT_CS_REG(R300_GA_POINT_SIZE,
|
||||||
((h * 6) & R300_POINTSIZE_Y_MASK) |
|
((h * 6) & R300_POINTSIZE_Y_MASK) |
|
||||||
|
|
Loading…
Reference in New Issue