- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs.

(#262941)
This commit is contained in:
Adam Jackson 2007-09-06 18:45:11 +00:00
parent 678a251d7c
commit bd476b00cf
2 changed files with 25 additions and 1 deletions

View file

@ -0,0 +1,19 @@
commit 410d8f7cdb40889e66f5c6794878ad9a5f572ee7
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Aug 29 10:13:10 2007 -0400
i965: samplers group in fours in WM_STATE. fix bug#9415
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index ff5cb31..5b4f2ab 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -117,7 +117,7 @@ static void upload_wm_unit(struct brw_context *brw )
wm.thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
/* CACHE_NEW_SAMPLER */
- wm.wm4.sampler_count = brw->wm.sampler_count;
+ wm.wm4.sampler_count = (brw->wm.sampler_count + 1) / 4;
wm.wm4.sampler_state_pointer = brw->wm.sampler_gs_offset >> 5;
/* BRW_NEW_FRAGMENT_PROGRAM */

View file

@ -32,7 +32,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.0.1 Version: 7.0.1
Release: 4%{?dist} Release: 5%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -52,6 +52,7 @@ Patch24: mesa-7.0-i-already-defined-glapi-you-twit.patch
Patch25: mesa-7.0-symlinks-before-depend.patch Patch25: mesa-7.0-symlinks-before-depend.patch
Patch26: mesa-7.0.1-stable-branch.patch Patch26: mesa-7.0.1-stable-branch.patch
Patch27: mesa-7.0-use_master-r300.patch Patch27: mesa-7.0-use_master-r300.patch
Patch28: mesa-7.0.1-965-sampler-crash.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{with_dri} %if %{with_dri}
@ -183,6 +184,7 @@ chmod a-x progs/demos/glslnoise.c
%patch25 -p1 -b .makej %patch25 -p1 -b .makej
%patch26 -p1 -b .stable %patch26 -p1 -b .stable
%patch27 -p1 -b .r300 %patch27 -p1 -b .r300
%patch28 -p1 -b .965-sampler
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them. # license and are not open source/free software, so we remove them.
@ -412,6 +414,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data %{_libdir}/mesa-demos-data
%changelog %changelog
* Thu Sep 06 2007 Adam Jackson <ajax@redhat.com> 7.0.1-5
- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
* Tue Aug 28 2007 Adam Jackson <ajax@redhat.com> 7.0.1-4 * Tue Aug 28 2007 Adam Jackson <ajax@redhat.com> 7.0.1-4
- Rebuild for new libexpat. - Rebuild for new libexpat.