KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300-gallium: Move scissor state. 

Keep it grouped with all the other parameterized state.
This commit is contained in:
Corbin Simpson 2009-03-05 11:01:03 -08:00
parent 626ac95335
commit ac2acda036
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/r300/r300_surface.c
View File

@ -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) |