rpms
/
mesa
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

F-11 merge

This commit is contained in:
Adam Jackson 2009-06-11 17:24:36 +00:00
parent f77271ad73
commit 317e057245
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mesa-7.5-r300-batch-accounting.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c.jx mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c
--- mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c.jx 2009-05-18 11:17:36.000000000 -0400
+++ mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c 2009-05-21 16:32:32.000000000 -0400
@@ -251,7 +251,7 @@ static void emit_cb_offset(GLcontext *ct
OUT_BATCH(((rrb->width - 1) << R300_SCISSORS_X_SHIFT) |
((rrb->height - 1) << R300_SCISSORS_Y_SHIFT));
END_BATCH();
- BEGIN_BATCH_NO_AUTOSTATE(16);
+ BEGIN_BATCH_NO_AUTOSTATE(7);
for (i = 0; i < 1; i++) {
OUT_BATCH_REGSEQ(R300_SC_CLIPRECT_TL_0 + (i * 8), 2);
OUT_BATCH((0 << R300_CLIPRECT_X_SHIFT) | (0 << R300_CLIPRECT_Y_SHIFT));

13
radeon-rewrite-emit1clip.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index afca0e2..a006e8f 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -252,7 +252,7 @@ static void emit_cb_offset(GLcontext *ctx, struct radeon_state_atom * atom)
((rrb->height - 1) << R300_SCISSORS_Y_SHIFT));
END_BATCH();
BEGIN_BATCH_NO_AUTOSTATE(16);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < 1; i++) {
OUT_BATCH_REGSEQ(R300_SC_CLIPRECT_TL_0 + (i * 8), 2);
OUT_BATCH((0 << R300_CLIPRECT_X_SHIFT) | (0 << R300_CLIPRECT_Y_SHIFT));
OUT_BATCH(((rrb->width - 1) << R300_CLIPRECT_X_SHIFT) | ((rrb->height - 1) << R300_CLIPRECT_Y_SHIFT));