* Mon Oct 2 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-44.fc6

- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
  before calling back into XAA to evict pixmaps.
This commit is contained in:
Kristian Høgsberg 2006-10-02 22:06:48 +00:00
parent eb5ef29d7a
commit 282ba8b4b3
2 changed files with 8 additions and 2 deletions

View File

@ -33,7 +33,7 @@
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
--- ./GL/glx/glxdri.c.offscreen-pixmaps 2006-08-30 16:46:45.000000000 -0400 --- ./GL/glx/glxdri.c.offscreen-pixmaps 2006-08-30 16:46:45.000000000 -0400
+++ ./GL/glx/glxdri.c 2006-08-30 16:45:52.000000000 -0400 +++ ./GL/glx/glxdri.c 2006-08-30 16:45:52.000000000 -0400
@@ -367,6 +367,19 @@ @@ -367,6 +367,21 @@
int bpp; int bpp;
GLenum target, format, type; GLenum target, format, type;
@ -45,7 +45,9 @@
+ static int evictedPixmaps; + static int evictedPixmaps;
+ +
+ if (!evictedPixmaps) { + if (!evictedPixmaps) {
+ __glXDRIenterServer();
+ XAAEvictPixmaps(); + XAAEvictPixmaps();
+ __glXDRIleaveServer();
+ evictedPixmaps = TRUE; + evictedPixmaps = TRUE;
+ } + }
+ } + }

View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.1.1 Version: 1.1.1
Release: 43%{?dist} Release: 44%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -719,6 +719,10 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %changelog
* Mon Oct 2 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-44.fc6
- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
before calling back into XAA to evict pixmaps.
* Wed Sep 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-43.fc6 * Wed Sep 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-43.fc6
- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: Since the - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: Since the
VT_ACTIVATE/VT_WAITACTIVE pair are never guaranteed to successfully VT_ACTIVATE/VT_WAITACTIVE pair are never guaranteed to successfully