* Tue Aug 14 2007 Adam Jackson <ajax@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.
This commit is contained in:
Adam Jackson 2007-08-14 15:12:43 +00:00
parent 5d4276c96a
commit b70e2fbc98
2 changed files with 6 additions and 2 deletions

View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
Release: 18%{?dist}
Release: 19%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@ -604,6 +604,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Aug 14 2007 Adam Jackson <ajax@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.
* Mon Aug 13 2007 Dave Airlie <airlied@redhat.com> 1.3.0.0-18
- xserver-1.3.0-mesa7.patch: Add support for building against mesa 7.0.1
along with DRI zero-copy TFP hopefully

View File

@ -39,7 +39,7 @@ diff -up xorg-server-1.3.0.0/GL/glx/glxdri.c.offscreen-pixmaps xorg-server-1.3.0
__GLXDRIscreen * const screen =
(__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum);
+ if (!screen->driScreen.setTexOffset) {
+ if (1 || !screen->driScreen.setTexOffset) {
+ /* 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. */