disable ARB_fragment_shader on gen3

This commit is contained in:
Adam Jackson 2010-11-01 12:58:53 -04:00
parent 4ac3d5dcb5
commit ce859b97c6
2 changed files with 33 additions and 1 deletions

View file

@ -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

View file

@ -23,7 +23,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.9 Version: 7.9
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -50,6 +50,7 @@ Patch5: mesa-demos-fix-add-needed.patch
#Patch7: mesa-7.1-link-shared.patch #Patch7: mesa-7.1-link-shared.patch
Patch30: mesa-7.6-hush-vblank-warning.patch Patch30: mesa-7.6-hush-vblank-warning.patch
Patch31: mesa-7.9-i915-no-gen3-arbfs.patch
BuildRequires: pkgconfig autoconf automake libtool BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware} %if %{with_hardware}
@ -196,6 +197,7 @@ Group: User Interface/X Hardware Support
%patch4 -p1 -b .nouveau %patch4 -p1 -b .nouveau
#%patch7 -p1 -b .dricore #%patch7 -p1 -b .dricore
%patch30 -p1 -b .vblank-warning %patch30 -p1 -b .vblank-warning
%patch31 -p1 -b .arbfs
# Hack the demos to use installed data files # Hack the demos to use installed data files
cd ../%{demopkg} cd ../%{demopkg}
@ -431,6 +433,10 @@ rm -rf $RPM_BUILD_ROOT
%{demodir} %{demodir}
%changelog %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 * Thu Oct 14 2010 Dave Airlie <airlied@redhat.com> 7.9-1
- 7.9 branch post release + fixes - 7.9 branch post release + fixes