rpms/mesa/F-10 r300-dont-fail-on-fog.patch, NONE, 1.1 mesa.spec, 1.208, 1.209

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477

Modified Files:
	mesa.spec 
Added Files:
	r300-dont-fail-on-fog.patch 
Log Message:
* Thu Dec 04 2008 Dave Airlie <airlied at redhat.com> 7.2-0.15
- r300-dont-fail-on-fog.patch: dirty workaround hope it works


r300-dont-fail-on-fog.patch:

--- NEW FILE r300-dont-fail-on-fog.patch ---
diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c
index 5ad50d2..99b9d45 100644
--- a/src/mesa/drivers/dri/r300/radeon_program_pair.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_pair.c
@@ -474,8 +474,8 @@ static void allocate_input_registers(struct pair_state *s)
 	InputsRead &= ~FRAG_BIT_COL1;
 
 	/* Anything else */
-	if (InputsRead)
-		error("Don't know how to handle inputs 0x%x\n", InputsRead);
+	//if (InputsRead)
+	//	error("Don't know how to handle inputs 0x%x\n", InputsRead);
 }
 
 


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-10/mesa.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- mesa.spec	28 Nov 2008 01:47:16 -0000	1.208
+++ mesa.spec	4 Dec 2008 00:45:40 -0000	1.209
@@ -18,7 +18,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.2
-Release: 0.14%{?dist}
+Release: 0.15%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -38,6 +38,7 @@
 Patch4: depth-override-fix.patch
 
 Patch5: r300-bufmgr.patch
+Patch6: r300-dont-fail-on-fog.patch
 
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
@@ -176,6 +177,7 @@
 %patch3 -p0 -b .no-mach64
 %patch4 -p1 -b .depth-override-fix
 %patch5 -p1 -b .r300-bufmgr
+%patch6 -p1 -b .r300-fog-fail
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
@@ -431,6 +433,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Dec 04 2008 Dave Airlie <airlied at redhat.com> 7.2-0.15
+- r300-dont-fail-on-fog.patch: dirty workaround hope it works
+
 * Fri Nov 28 2008 Dave Airlie <airlied at redhat.com> 7.2-0.14
 - mesa-7.1-fix-i8xx-vbos.patch: fix i8xx hw rendering