rpms/mesa/devel mesa-7.0.1-965-sampler-crash.patch, NONE, 1.1 mesa.spec, 1.139, 1.140

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32021

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.0.1-965-sampler-crash.patch 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)


mesa-7.0.1-965-sampler-crash.patch:

--- NEW FILE mesa-7.0.1-965-sampler-crash.patch ---
commit 410d8f7cdb40889e66f5c6794878ad9a5f572ee7
Author: Xiang, Haihao <haihao.xiang at 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 */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mesa.spec	28 Aug 2007 13:39:17 -0000	1.139
+++ mesa.spec	6 Sep 2007 18:45:11 -0000	1.140
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -52,6 +52,7 @@
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.0.1-stable-branch.patch
 Patch27: mesa-7.0-use_master-r300.patch
+Patch28: mesa-7.0.1-965-sampler-crash.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -183,6 +184,7 @@
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .stable
 %patch27 -p1 -b .r300
+%patch28 -p1 -b .965-sampler
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -412,6 +414,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at 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 at redhat.com> 7.0.1-4
 - Rebuild for new libexpat.