From eb00d17ad2ab521681c1c880fb704515d689fc7d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Mon, 5 May 2008 04:34:12 +0000
Subject: [PATCH] - fix rs480 compiz support

---
 mesa-r300-fix-compiz.patch | 43 ++++++++++++++++++++++++++++++++++++++
 mesa.spec                  |  7 ++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 mesa-r300-fix-compiz.patch

diff --git a/mesa-r300-fix-compiz.patch b/mesa-r300-fix-compiz.patch
new file mode 100644
index 0000000..f5b7721
--- /dev/null
+++ b/mesa-r300-fix-compiz.patch
@@ -0,0 +1,43 @@
+diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
+index ae5d8a8..aa0de4e 100644
+--- a/src/mesa/drivers/dri/r300/r300_state.c
++++ b/src/mesa/drivers/dri/r300/r300_state.c
+@@ -2129,10 +2129,11 @@ void r300UpdateShaders(r300ContextPtr rmesa)
+ 			hw_tcl_on = future_hw_tcl_on = 0;
+ 			r300ResetHwState(rmesa);
+ 
++			r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ 			return;
+ 		}
+-		r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ 	}
++	r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ }
+ 
+ static void r300SetupPixelShader(r300ContextPtr rmesa)
+diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
+index a732bdb..1452ed5 100644
+--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
++++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
+@@ -591,6 +591,7 @@ static void r300RenderStart(GLcontext *ctx)
+ 	r300ChooseRenderState(ctx);	
+ 	r300SetVertexFormat(ctx);
+ 
++	r300UpdateShaders(rmesa);
+ 	r300UpdateShaderStates(rmesa);
+ 
+ 	r300EmitCacheFlush(rmesa);
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index 6107577..5cf7f89 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
++++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -697,6 +697,9 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+       return NULL;
+    }
+ 
++   if (getenv("R300_NO_TCL"))
++     screen->chip_flags &= ~RADEON_CHIPSET_TCL;
++
+    if (screen->chip_family <= CHIP_FAMILY_RS200)
+       screen->chip_flags |= RADEON_CLASS_R100;
+    else if (screen->chip_family <= CHIP_FAMILY_RV280)
diff --git a/mesa.spec b/mesa.spec
index 49c7819..e980948 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -54,6 +54,7 @@ Patch28: mesa-7.0.1-r300-fix-writemask.patch
 Patch30: mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch
 Patch31: mesa-7.0.2-t_vp_build-use-less-temps.patch
 Patch32: mesa-7.0.2-e7221.patch
+Patch33: mesa-r300-fix-compiz.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -187,6 +188,7 @@ chmod a-x progs/demos/glslnoise.c
 %patch30 -p1 -b .rx00-fix-vp
 %patch31 -p1 -b .vp-temp-fix
 %patch32 -p1 -b .e7221
+%patch33 -p1 -b .rs4xx-compiz
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -416,6 +418,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon May 05 2008 Dave Airlie <airlied@redhat.com> 7.0.2-4
+- fix rs480 compiz support
+
 * Tue Jan 22 2008 Adam Jackson <ajax@redhat.com> 7.0.2-3
 - mesa-7.0.2-e7221.patch: Enable i915 DRI on E7221. (Carlos Martín, #425790)