summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@fedoraproject.org>2010-01-27 04:14:39 +0000
committerDave Airlie <airlied@fedoraproject.org>2010-01-27 04:14:39 +0000
commit1396538016c81b554c71a089591cf29785b88ef6 (patch)
tree8f1cf2cdb5f3cf24f21778fa706c4343b6323049
parent408ce2a3b2f8f18f50ffe239e14ae84510068631 (diff)
downloadmesa-1396538016c81b554c71a089591cf29785b88ef6.tar.gz
mesa-1396538016c81b554c71a089591cf29785b88ef6.tar.xz
mesa-1396538016c81b554c71a089591cf29785b88ef6.zip
- Fix radeon colors for rawhidemesa-7_8-0_12_fc13
-rw-r--r--mesa-7.7-fix-radeon-colors.patch37
-rw-r--r--mesa.spec7
2 files changed, 43 insertions, 1 deletions
diff --git a/mesa-7.7-fix-radeon-colors.patch b/mesa-7.7-fix-radeon-colors.patch
new file mode 100644
index 0000000..819f158
--- /dev/null
+++ b/mesa-7.7-fix-radeon-colors.patch
@@ -0,0 +1,37 @@
+From 395e08a839bca94b8c0cd7fca4b48bb06bc02952 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Wed, 27 Jan 2010 11:46:26 +1000
+Subject: [PATCH] radeon/r200/r300: don't clean non-emitted state.
+
+So if we don't actually emit an atom to the hw because we don't
+need it in the current state (e.g. lighting related atoms when
+lighting is off) then don't mark it as clean, because when
+lighting gets switched on we won't emit it at all.
+
+This fixes funky gears colors.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+ src/mesa/drivers/dri/radeon/radeon_common.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
+index e0b853b..79f3ff7 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_common.c
++++ b/src/mesa/drivers/dri/radeon/radeon_common.c
+@@ -1036,10 +1036,11 @@ static INLINE void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state
+ OUT_BATCH_TABLE(atom->cmd, dwords);
+ END_BATCH();
+ }
++ atom->dirty = GL_FALSE;
++
+ } else {
+ radeon_print(RADEON_STATE, RADEON_VERBOSE, " skip state %s\n", atom->name);
+ }
+- atom->dirty = GL_FALSE;
+
+ }
+
+--
+1.6.5.2
+
diff --git a/mesa.spec b/mesa.spec
index aeb7527..2201cbe 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -21,7 +21,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.8
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -41,6 +41,7 @@ Patch1: mesa-7.1-osmesa-version.patch
Patch2: mesa-7.1-nukeglthread-debug.patch
Patch3: mesa-no-mach64.patch
+Patch5: mesa-7.7-fix-radeon-colors.patch
#Patch7: mesa-7.1-link-shared.patch
Patch30: mesa-7.6-hush-vblank-warning.patch
@@ -180,6 +181,7 @@ Group: User Interface/X Hardware Support
%patch1 -p1 -b .osmesa
%patch2 -p1 -b .intel-glthread
%patch3 -p1 -b .no-mach64
+%patch5 -p1 -b .r100-color
#%patch7 -p1 -b .dricore
%patch30 -p1 -b .vblank-warning
@@ -393,6 +395,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
%changelog
+* Wed Jan 27 2010 Dave Airlie <airlied@redhat.com> 7.8-0.12
+- Fix radeon colors for rawhide
+
* Thu Jan 21 2010 Dave Airlie <airlied@redhat.com> 7.8-0.11
- rebase for new DRI2 API