From ce859b97c6c5855337538a61e5de8a3c074b271b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 1 Nov 2010 12:58:53 -0400
Subject: [PATCH] disable ARB_fragment_shader on gen3

---
 mesa-7.9-i915-no-gen3-arbfs.patch | 26 ++++++++++++++++++++++++++
 mesa.spec                         |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 mesa-7.9-i915-no-gen3-arbfs.patch

diff --git a/mesa-7.9-i915-no-gen3-arbfs.patch b/mesa-7.9-i915-no-gen3-arbfs.patch
new file mode 100644
index 0000000..d2aee8e
--- /dev/null
+++ b/mesa-7.9-i915-no-gen3-arbfs.patch
@@ -0,0 +1,26 @@
+From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
+From: Robert Hooker <sarvatt@ubuntu.com>
+Date: Wed, 8 Sep 2010 12:33:09 -0400
+Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
+
+This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
+---
+ src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 0a542a7..8ae2cd2 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
+ 	 DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
+       DRI_CONF_OPT_END
+ 
+-      DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
++      DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
+ 	 DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
+       DRI_CONF_OPT_END
+ 
+-- 
+1.7.2
+
diff --git a/mesa.spec b/mesa.spec
index 8a8d0a0..539aa6f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -23,7 +23,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -50,6 +50,7 @@ Patch5: mesa-demos-fix-add-needed.patch
 #Patch7: mesa-7.1-link-shared.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
+Patch31: mesa-7.9-i915-no-gen3-arbfs.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -196,6 +197,7 @@ Group: User Interface/X Hardware Support
 %patch4 -p1 -b .nouveau
 #%patch7 -p1 -b .dricore
 %patch30 -p1 -b .vblank-warning
+%patch31 -p1 -b .arbfs
 
 # Hack the demos to use installed data files
 cd ../%{demopkg}
@@ -431,6 +433,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Nov 01 2010 Adam Jackson <ajax@redhat.com> 7.9-2
+- mesa-7.9-i915-no-gen3-arbfs.patch: Disable ARB_fragment_shader on intel
+  gen3 by default for now (#640375)
+
 * Thu Oct 14 2010 Dave Airlie <airlied@redhat.com> 7.9-1
 - 7.9 branch post release + fixes