rpms/mesa/devel mesa-6.5-force-r300.patch, 1.2, 1.3 mesa-6.5.1-r300-smooth-line.patch, NONE, 1.1 mesa.spec, 1.89, 1.90

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1858

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-force-r300.patch mesa-6.5.1-r300-smooth-line.patch 
Log Message:
* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-25.20060818cvs.fc6
- mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
  lines on R300+ cards, makes Google Earth tolerable.
- mesa-6.5-force-r300.patch: Resurrect.


mesa-6.5-force-r300.patch:
 radeon_screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: mesa-6.5-force-r300.patch
===================================================================
RCS file: mesa-6.5-force-r300.patch
diff -N mesa-6.5-force-r300.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mesa-6.5-force-r300.patch	22 Aug 2006 22:58:51 -0000	1.3
@@ -0,0 +1,11 @@
+--- ./src/mesa/drivers/dri/radeon/radeon_screen.c.force-r300	2006-04-11 17:08:36.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_screen.c	2006-04-11 17:09:20.000000000 -0400
+@@ -639,7 +639,7 @@
+    }
+    if (screen->chip_family == CHIP_FAMILY_R350 || 
+        screen->chip_family == CHIP_FAMILY_R300) {
+-	   if (getenv("R300_FORCE_R300") == NULL) {
++	   if (0 && getenv("R300_FORCE_R300") == NULL) {
+ 		   fprintf(stderr, "Radeon 9500/9700/9800 cards are not currently stable.\n");
+ 		   fprintf(stderr, "More details can be found at https://bugs.freedesktop.org/show_bug.cgi?id=6318\n");
+ 		   return NULL;

mesa-6.5.1-r300-smooth-line.patch:
 r300_render.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-6.5.1-r300-smooth-line.patch ---
--- Mesa-6.5/src/mesa/drivers/dri/r300/r300_render.c.r300-smooth-lines	2006-08-02 21:37:23.000000000 +0200
+++ Mesa-6.5/src/mesa/drivers/dri/r300/r300_render.c	2006-08-02 21:37:23.000000000 +0200
@@ -490,7 +490,7 @@
 	FALLBACK_IF(ctx->Line.StippleFlag);
 	
 	/* HW doesnt appear to directly support these */
-	FALLBACK_IF(ctx->Line.SmoothFlag); // GL_LINE_SMOOTH
+	//FALLBACK_IF(ctx->Line.SmoothFlag); // GL_LINE_SMOOTH
 	FALLBACK_IF(ctx->Point.SmoothFlag); // GL_POINT_SMOOTH
 	/* Rest could be done with vertex fragments */
 	if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite)


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mesa.spec	22 Aug 2006 19:36:12 -0000	1.89
+++ mesa.spec	22 Aug 2006 22:58:51 -0000	1.90
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 24.%{snapshot}cvs%{?dist}
+Release: 25.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -60,6 +60,9 @@
 Patch18: mesa-6.5.1-selinux-awareness.patch
 Patch19: mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch
 
+Patch20: mesa-6.5.1-r300-smooth-line.patch
+Patch21: mesa-6.5-force-r300.patch
+
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
@@ -308,6 +311,9 @@
 %patch18 -p1 -b .selinux-awareness
 %patch19 -p1 -b .vtxfmt
 
+%patch20 -p1 -b .r300-smooth-lines
+%patch21 -p0 -b .force-r300
+
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
 # a change for post feature freeze.  Leaving off for now...
@@ -506,6 +512,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-25.20060818cvs.fc6
+- mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
+  lines on R300+ cards, makes Google Earth tolerable.
+- mesa-6.5-force-r300.patch: Resurrect.
+
 * Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-24.20060818cvs.fc6
 - mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch: Fix a segfault on context
   destruction when selinux is enabled.