Attachment 668 Details for Bug 1032 – Patch to make rootless acceleration compatible with Damage

[patch] Patch to make rootless acceleration compatible with Damage

damage.patch (text/plain), 9.15 KB, created by Torrey T. Lyons on 2004-08-18 13:16:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torrey T. Lyons

Created: 2004-08-18 13:16:52 UTC

Size: 9.15 KB

patch

obsolete

>cvs diff: Diffing miext/rootless
>Index: miext/rootless/rootless.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/rootless.h,v
>retrieving revision 1.3
>diff -u -d -b -w -r1.3 rootless.h
>--- miext/rootless/rootless.h	30 Jul 2004 19:12:17 -0000	1.3
>+++ miext/rootless/rootless.h	18 Aug 2004 19:50:28 -0000
>@@ -369,6 +369,13 @@
> Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs);
> 
> /*
>+ * Initialize acceleration for rootless mode on a given screen.
>+ *  Note: RootlessAccelInit() must be called before DamageSetup()
>+ *  and RootlessInit() must be called afterwards.
>+ */
>+Bool RootlessAccelInit(ScreenPtr pScreen);
>+
>+/*
>  * Return the frame ID for the physical window displaying the given window. 
>  *
>  *  create      If true and the window has no frame, attempt to create one
>Index: miext/rootless/rootlessGC.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/rootlessGC.c,v
>retrieving revision 1.2
>diff -u -d -b -w -r1.2 rootlessGC.c
>--- miext/rootless/rootlessGC.c	23 Apr 2004 19:54:27 -0000	1.2
>+++ miext/rootless/rootlessGC.c	18 Aug 2004 19:50:29 -0000
>@@ -45,10 +45,6 @@
> 
> #include "rootlessCommon.h"
> 
>-#if ROOTLESS_ACCEL
>-#include "rlAccel.h"
>-#endif
>-
> 
> // GC functions
> static void RootlessValidateGC(GCPtr pGC, unsigned long changes,
>@@ -165,7 +161,7 @@
> 
>        ...
> 
>-       if (can_accel_xxx(..) && otherwise-suitable)
>+       if (canAccelxxx(..) && otherwise-suitable)
>             GC_UNSET_PM(gc, dst);
> 
>        gc->funcs->OP(gc, ...);
>@@ -283,13 +279,6 @@
>             devPrivates[rootlessScreenPrivateIndex].ptr;
>     result = s->CreateGC(pGC);
> 
>-#if ROOTLESS_ACCEL
>-    pGC->ops->FillSpans = rlFillSpans;
>-    pGC->ops->CopyArea = rlCopyArea;
>-    pGC->ops->PolyFillRect = rlPolyFillRect;
>-    pGC->ops->ImageGlyphBlt = rlImageGlyphBlt;
>-#endif
>-
>     gcrec = (RootlessGCRec *) pGC->devPrivates[rootlessGCPrivateIndex].ptr;
>     gcrec->originalOps = NULL; // don't wrap ops yet
>     gcrec->originalFuncs = pGC->funcs;
>cvs diff: Diffing miext/rootless/accel
>Index: miext/rootless/accel/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/accel/Imakefile,v
>retrieving revision 1.2
>diff -u -d -b -w -r1.2 Imakefile
>--- miext/rootless/accel/Imakefile	23 Apr 2004 19:54:27 -0000	1.2
>+++ miext/rootless/accel/Imakefile	18 Aug 2004 19:50:29 -0000
>@@ -2,7 +2,8 @@
> 
> #include <Server.tmpl>
> 
>-SRCS =  rlBlt.c \
>+SRCS =  rlAccel.c \
>+        rlBlt.c \
>         rlCopy.c \
>         rlFill.c \
>         rlFillRect.c \
>@@ -10,7 +11,8 @@
>         rlGlyph.c \
>         rlSolid.c
> 
>-OBJS =  rlBlt.o \
>+OBJS =  rlAccel.o \
>+        rlBlt.o \
>         rlCopy.o \
>         rlFill.o \
>         rlFillRect.o \
>Index: miext/rootless/accel/rlAccel.c
>===================================================================
>RCS file: miext/rootless/accel/rlAccel.c
>diff -N miext/rootless/accel/rlAccel.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ miext/rootless/accel/rlAccel.c	18 Aug 2004 19:50:29 -0000
>@@ -0,0 +1,97 @@
>+/*
>+ * Support for accelerated rootless code
>+ */
>+/*
>+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
>+ *
>+ * Permission is hereby granted, free of charge, to any person obtaining a
>+ * copy of this software and associated documentation files (the "Software"),
>+ * to deal in the Software without restriction, including without limitation
>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
>+ * and/or sell copies of the Software, and to permit persons to whom the
>+ * Software is furnished to do so, subject to the following conditions:
>+ *
>+ * The above copyright notice and this permission notice shall be included in
>+ * all copies or substantial portions of the Software.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
>+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>+ * DEALINGS IN THE SOFTWARE.
>+ *
>+ * Except as contained in this notice, the name(s) of the above copyright
>+ * holders shall not be used in advertising or otherwise to promote the sale,
>+ * use or other dealings in this Software without prior written authorization.
>+ */
>+/* $XdotOrg: $ */
>+
>+#include "rootless.h"
>+#include "rlAccel.h"
>+
>+typedef struct _rlAccelScreenRec {
>+    CreateGCProcPtr CreateGC;
>+} rlAccelScreenRec, *rlAccelScreenPtr;
>+
>+static int rlAccelScreenPrivateIndex = -1;
>+
>+#define RLACCELREC(pScreen) \
>+   ((rlAccelScreenRec *)(pScreen)->devPrivates[rlAccelScreenPrivateIndex].ptr)
>+
>+
>+/*
>+ * Screen function to create a graphics context
>+ */
>+static Bool
>+rlCreateGC(GCPtr pGC)
>+{
>+    ScreenPtr pScreen = pGC->pScreen;
>+    rlAccelScreenRec *s = RLACCELREC(pScreen);
>+    Bool result;
>+
>+    // Unwrap and call
>+    pScreen->CreateGC = s->CreateGC;
>+    result = s->CreateGC(pGC);
>+
>+    // Accelerated GC ops replace some ops
>+    pGC->ops->FillSpans = rlFillSpans;
>+    pGC->ops->CopyArea = rlCopyArea;
>+    pGC->ops->PolyFillRect = rlPolyFillRect;
>+    pGC->ops->ImageGlyphBlt = rlImageGlyphBlt;
>+
>+    // Rewrap
>+    s->CreateGC = pScreen->CreateGC;
>+    pScreen->CreateGC = rlCreateGC;
>+
>+    return result;
>+}
>+
>+
>+/*
>+ * RootlessAccelInit
>+ *  Called by the rootless implementation to initialize accelerated
>+ *  rootless drawing.
>+ */
>+Bool
>+RootlessAccelInit(ScreenPtr pScreen)
>+{
>+    static unsigned long rlAccelGeneration = 0;
>+    rlAccelScreenRec *s;
>+
>+    if (rlAccelGeneration != serverGeneration) {
>+        rlAccelScreenPrivateIndex = AllocateScreenPrivateIndex();
>+        if (rlAccelScreenPrivateIndex == -1) return FALSE;
>+    }
>+
>+    s = xalloc(sizeof(rlAccelScreenRec));
>+    if (!s) return FALSE;
>+    RLACCELREC(pScreen) = s;
>+
>+    // Wrap the one screen function we need
>+    s->CreateGC = pScreen->CreateGC;
>+    pScreen->CreateGC = rlCreateGC;
>+
>+    return TRUE;
>+}
>Index: miext/rootless/accel/rlAccel.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/accel/rlAccel.h,v
>retrieving revision 1.2
>diff -u -d -b -w -r1.2 rlAccel.h
>--- miext/rootless/accel/rlAccel.h	23 Apr 2004 19:54:27 -0000	1.2
>+++ miext/rootless/accel/rlAccel.h	18 Aug 2004 19:50:29 -0000
>@@ -28,6 +28,8 @@
>  */
> /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */
> 
>+#include "fb.h"
>+
> /*
>  * rlBlt.c
>  */
>cvs diff: Diffing miext/rootless/safeAlpha
>cvs diff: Diffing hw/xwin
>Index: hw/xwin/winscrinit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winscrinit.c,v
>retrieving revision 1.3
>diff -u -d -b -w -r1.3 winscrinit.c
>--- winscrinit.c        21 Jun 2004 13:19:32 -0000      1.3
>+++ winscrinit.c        18 Aug 2004 20:04:33 -0000
>@@ -365,6 +365,22 @@
>   pScreen->blockData = pScreen;
>   pScreen->wakeupData = pScreen;
> 
>+#ifdef XWIN_MULTIWINDOWEXTWM
>+  /*
>+   * Setup acceleration for multi-window external window manager mode.
>+   * To be compatible with the Damage extension, this must be done
>+   * before calling miDCInitialize, which calls DamageSetup.
>+   */
>+  if (pScreenInfo->fMWExtWM)
>+    {
>+      if (!RootlessAccelInit (pScreen))
>+        {
>+          ErrorF ("winFinishScreenInitFB - RootlessAccelInit () failed\n");
>+          return FALSE;
>+        }
>+    }
>+#endif
>+
> #ifdef RENDER
>   /* Render extension initialization, calls miPictureInit */
>   if (!fbPictureInit (pScreen, NULL, 0))
>cvs diff: Diffing hw/darwin/quartz/cr
>Index: hw/darwin/quartz/cr/crScreen.m
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 crScreen.m
>--- hw/darwin/quartz/cr/crScreen.m	12 Aug 2004 20:24:36 -0000	1.4
>+++ hw/darwin/quartz/cr/crScreen.m	18 Aug 2004 19:50:29 -0000
>@@ -261,6 +261,10 @@
>     }
> #endif /* RENDER */
> 
>+    // Initialize accelerated rootless drawing
>+    // Note that this must be done before DamageSetup().
>+    RootlessAccelInit(pScreen);
>+
> #ifdef DAMAGE
>     // The Damage extension needs to wrap underneath the
>     // generic rootless layer, so do it now.
>cvs diff: Diffing hw/darwin/quartz/fullscreen
>cvs diff: Diffing hw/darwin/quartz/xpr
>Index: hw/darwin/quartz/xpr/xprScreen.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 xprScreen.c
>--- hw/darwin/quartz/xpr/xprScreen.c	12 Aug 2004 20:24:36 -0000	1.4
>+++ hw/darwin/quartz/xpr/xprScreen.c	18 Aug 2004 19:50:29 -0000
>@@ -325,6 +325,10 @@
>     }
> #endif /* RENDER */
> 
>+    // Initialize accelerated rootless drawing
>+    // Note that this must be done before DamageSetup().
>+    RootlessAccelInit(pScreen);
>+
> #ifdef DAMAGE
>     // The Damage extension needs to wrap underneath the
>     // generic rootless layer, so do it now.

Actions: View | Splinter Review

Attachments on bug 1032: 668

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.