- radeon fix clip emitsmesa-7_5-0_13_fc11

2 files changed, 20 insertions, 1 deletions

diff --git a/mesa.spec b/mesa.spec
index 2b2ab08..a3c0def 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,8 @@ Patch9: intel-revert-vbl.patch
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
+Patch15: radeon-rewrite-emit1clip.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -175,6 +177,7 @@ This package provides some demo applications for testing Mesa.
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
+%patch15 -p1 -b .fix-clip
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -429,6 +432,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied@redhat.com> 7.5-0.13
+- radeon fix clip emits
+
 * Tue Apr 28 2009 Dave Airlie <airlied@redhat.com> 7.5-0.12
 - rebase to upstream snapshot + radeon-rewrite
 
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));