* Wed Aug 15 2007 Dave Airlie <airlied@redhat.com> 1.3.0.0-20

- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again
This commit is contained in:
Dave Airlie 2007-08-15 08:35:20 +00:00
parent b70e2fbc98
commit bb8ddfe263
2 changed files with 5 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: 19%{?dist}
Release: 20%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Aug 15 2007 Dave Airlie <airlied@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@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.

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 (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. */