rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.1, 1.2 xorg-x11-server.spec, 1.143, 1.144
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Aug 8 16:33:13 UTC 2006
Author: krh
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24541
Modified Files:
xorg-x11-server-1.1.1-offscreen-pixmaps.patch
xorg-x11-server.spec
Log Message:
* Tue Aug 8 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-18.fc6
- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
selection is taken.
xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
xaaInit.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch 7 Aug 2006 18:32:27 -0000 1.1
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch 8 Aug 2006 16:33:11 -0000 1.2
@@ -1,17 +1,60 @@
-Patch to force pixmaps to be allocated in host memory. Work in
-progress, will eventually allow the xserver to keep pixmaps in video
-memory until the root window is redirected. At that point pixmaps are
-evicted to host memory and subsequent pixmap allocations are done in
-host memory.
-
---- ./hw/xfree86/xaa/xaaInitAccel.c.no-offscreen-pixmaps 2006-08-07 14:21:11.000000000 -0400
-+++ ./hw/xfree86/xaa/xaaInitAccel.c 2006-08-07 14:20:44.000000000 -0400
-@@ -92,7 +92,7 @@
- {XAAOPT_PIXMAP_CACHE, "XaaNoPixmapCache",
- OPTV_BOOLEAN, {0}, FALSE },
- {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
-- OPTV_BOOLEAN, {0}, FALSE },
-+ OPTV_BOOLEAN, {0}, TRUE },
- { -1, NULL,
- OPTV_NONE, {0}, FALSE }
- };
+--- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps 2006-07-05 14:31:42.000000000 -0400
++++ ./hw/xfree86/xaa/xaaInit.c 2006-08-07 18:44:21.000000000 -0400
+@@ -98,6 +98,34 @@
+ xfree(infoRec);
+ }
+
++static void
++SelectionChangedCallback (CallbackListPtr *list,
++ pointer xaaData, pointer callData)
++{
++ static Atom atom = BAD_RESOURCE;
++ static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
++
++ SelectionInfoPtr info = call_data;
++ XAAInfoRecPtr infoRec = xaa_data;
++
++ if (atom == BAD_RESOURCE)
++ {
++ atom = MakeAtom(atom_name, strlen(atom_name), True);
++ if (atom == BAD_RESOURCE)
++ return;
++ }
++
++ if (info->selection->selection == atom &&
++ info->kind == SelectionSetOwner &&
++ info->selection->window != None)
++ {
++ infoRec->offscreenDepths = 0;
++ infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
++
++ XAAMoveOutOffscreenPixmaps(pScreen);
++ XAAInvalidatePixmapCache(pScreen);
++ }
++}
+
+ Bool
+ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+@@ -228,11 +256,11 @@
+ if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
+ miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
+
++ AddCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
++
+ return TRUE;
+ }
+
+-
+-
+ static Bool
+ XAACloseScreen (int i, ScreenPtr pScreen)
+ {
+@@ -264,6 +292,8 @@
+
+ xfree ((pointer) pScreenPriv);
+
++ DeleteCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
++
+ return (*pScreen->CloseScreen) (i, pScreen);
+ }
+
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- xorg-x11-server.spec 7 Aug 2006 20:54:56 -0000 1.143
+++ xorg-x11-server.spec 8 Aug 2006 16:33:11 -0000 1.144
@@ -7,8 +7,8 @@
# For rawhide builds, bump the number /before/ the dist tag. For package
# upgrades to officially released distribution releases, if the package
# Version field above is not changing, append and/or bump a digit /after/
-# the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ...
-Release: 17.fc5.aiglx
+# the dist tag. ie: 25%{?dist}.0 -> 25%{?dist}.1 ...
+Release: 18%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -32,7 +32,6 @@
Patch104: xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
Patch105: xorg-x11-server-1.1.1-enable-composite.patch
Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.patch
-# Work-in-progress; for now just defaults XaaNoOffscreenPixmaps to false.
Patch107: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
# Red Hat specific tweaking, not intended for upstream
@@ -331,7 +330,7 @@
%patch104 -p0 -b .mesa-copy-sub-buffer
%patch105 -p0 -b .enable-composite
%patch106 -p1 -b .no-xnest-composite
-%patch107 -p0 -b .offscreen-pixmaps
+%patch107 -p1 -b .offscreen-pixmaps
%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
%patch1001 -p1 -b .Red-Hat-extramodes
@@ -681,6 +680,10 @@
# -------------------------------------------------------------------
%changelog
+* Tue Aug 8 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-18.fc6
+- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
+ selection is taken.
+
* Mon Aug 7 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-17.fc5.aiglx
- Build for fc5 aiglx repo.
More information about the fedora-cvs-commits
mailing list