diff options
| author | Adam Jackson <ajax@fedoraproject.org> | 2009-06-11 17:24:36 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@fedoraproject.org> | 2009-06-11 17:24:36 +0000 |
| commit | 317e05724507b0f602256863b9331811e964ed6d (patch) | |
| tree | 3c0e5e78c5bb67122f2494cef1652c755e8c6956 | |
| parent | f77271ad73d2432502fe9001943fb8399758af64 (diff) | |
| download | mesa-317e05724507b0f602256863b9331811e964ed6d.tar.gz mesa-317e05724507b0f602256863b9331811e964ed6d.tar.xz mesa-317e05724507b0f602256863b9331811e964ed6d.zip | |
F-11 mergemesa-7_5-0_15_fc12
| -rw-r--r-- | mesa-7.5-r300-batch-accounting.patch | 12 | ||||
| -rw-r--r-- | radeon-rewrite-emit1clip.patch | 13 |
2 files changed, 25 insertions, 0 deletions
diff --git a/mesa-7.5-r300-batch-accounting.patch b/mesa-7.5-r300-batch-accounting.patch new file mode 100644 index 0000000..2fbfcc2 --- /dev/null +++ b/mesa-7.5-r300-batch-accounting.patch @@ -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)); diff --git a/radeon-rewrite-emit1clip.patch b/radeon-rewrite-emit1clip.patch new file mode 100644 index 0000000..1262bfa --- /dev/null +++ b/radeon-rewrite-emit1clip.patch @@ -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)); |