From 138cb06098224bf7365953499e2dc2fc290f3e9e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Aug 15 2007 08:35:20 +0000 Subject: * Wed Aug 15 2007 Dave Airlie 1.3.0.0-20 - xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 05cae7f..1f08cb8 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 1.3.0.0-20 +- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again + * Tue Aug 14 2007 Adam Jackson 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. diff --git a/xserver-1.3.0-newglx-offscreen-pixmaps.patch b/xserver-1.3.0-newglx-offscreen-pixmaps.patch index 97845d4..148a91d 100644 --- a/xserver-1.3.0-newglx-offscreen-pixmaps.patch +++ b/xserver-1.3.0-newglx-offscreen-pixmaps.patch @@ -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. */