summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@fedoraproject.org>2009-05-21 20:54:30 +0000
committerAdam Jackson <ajax@fedoraproject.org>2009-05-21 20:54:30 +0000
commit60e7681b9a84a85d46ac343e838f3d027fd336d7 (patch)
treecfe439e7e5b31c09aae47cca32bdedb487cc7815
parentab8dcbcacd69917bc3dee170ac7dd735bfa0cbf3 (diff)
downloadmesa-60e7681b9a84a85d46ac343e838f3d027fd336d7.tar.gz
mesa-60e7681b9a84a85d46ac343e838f3d027fd336d7.tar.xz
mesa-60e7681b9a84a85d46ac343e838f3d027fd336d7.zip
- mesa-7.5-r300-batch-accounting.patch: Fix cmdbuf sizing (#501312)mesa-7_5-0_15_fc11
-rw-r--r--mesa-7.5-r300-batch-accounting.patch12
-rw-r--r--mesa.spec7
2 files changed, 18 insertions, 1 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/mesa.spec b/mesa.spec
index 604c258..a2be54b 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -20,7 +20,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.5
-Release: 0.14%{?dist}
+Release: 0.15%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -49,6 +49,7 @@ Patch12: mesa-7.1-disable-intel-classic-warn.patch
Patch13: mesa-7.5-sparc64.patch
Patch15: radeon-rewrite-emit1clip.patch
+Patch16: mesa-7.5-r300-batch-accounting.patch
BuildRequires: pkgconfig autoconf automake
%if %{with_dri}
@@ -178,6 +179,7 @@ This package provides some demo applications for testing Mesa.
%patch12 -p1 -b .intel-nowarn
%patch13 -p1 -b .sparc64
%patch15 -p1 -b .fix-clip
+%patch16 -p1 -b .r300-accounting
# Hack the demos to use installed data files
sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -432,6 +434,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data
%changelog
+* Thu May 21 2009 Adam Jackson <ajax@redhat.com> 7.5-0.15
+- mesa-7.5-r300-batch-accounting.patch: Fix cmdbuf sizing (#501312)
+
* Tue May 05 2009 Dave Airlie <airlied@redhat.com> 7.5-0.14
- radeon-rewrite.patch: fixes from upstream for rs690 + r200