From b70e2fbc9873f6e8e3c912f4a81042baf9fa6744 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 14 Aug 2007 15:12:43 +0000 Subject: [PATCH] * 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. --- xorg-x11-server.spec | 6 +++++- xserver-1.3.0-newglx-offscreen-pixmaps.patch | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8779470..05cae7f 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: 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 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 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 diff --git a/xserver-1.3.0-newglx-offscreen-pixmaps.patch b/xserver-1.3.0-newglx-offscreen-pixmaps.patch index 6497e56..97845d4 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 (!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. */