rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.245, 1.246 xserver-1.3.0-newglx-offscreen-pixmaps.patch, 1.2, 1.3

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3079

Modified Files:
	xorg-x11-server.spec 
	xserver-1.3.0-newglx-offscreen-pixmaps.patch 
Log Message:
* Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-20
- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- xorg-x11-server.spec	14 Aug 2007 15:12:43 -0000	1.245
+++ xorg-x11-server.spec	15 Aug 2007 08:35:20 -0000	1.246
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -604,6 +604,9 @@
 
 
 %changelog
+* Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-20
+- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again
+
 * Tue Aug 14 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-19
 - xserver-1.3.0-newglx-offscreen-pixmaps.patch: Zero-copy TFP is busted
   on at least my laptop, so turn it off again.

xserver-1.3.0-newglx-offscreen-pixmaps.patch:

Index: xserver-1.3.0-newglx-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-newglx-offscreen-pixmaps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.3.0-newglx-offscreen-pixmaps.patch	14 Aug 2007 15:12:43 -0000	1.2
+++ xserver-1.3.0-newglx-offscreen-pixmaps.patch	15 Aug 2007 08:35:20 -0000	1.3
@@ -39,7 +39,7 @@
      __GLXDRIscreen * const screen =
  	(__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum);
  
-+    if (1 || !screen->driScreen.setTexOffset) {
++    if (!screen->texOffsetStart) {
 +         /* When the GLX_EXT_texture_from_pixmap is used, as it's
 +          * implemented here, we want to pull pixmap out of video memory
 +          * and into host memory. */