Rewrite render support in composite wrapper to (almost) work. FIXME:

    PaintWindowBackground/CopyWindow is still broken.
Remove mfb from Xvfb. Use standard visual formats so Render actually works.

Author: keith-packard

hw/vfb/InitOutput.c

@@ -45,6 +45,7 @@ from The Open Group.
 #include "gcstruct.h"
 #include "input.h"
 #include "mipointer.h"
+#include "micmap.h"
 #include <sys/types.h>
 #ifdef HAS_MMAP
 #include <sys/mman.h>
@@ -64,7 +65,6 @@ from The Open Group.
 #endif /* HAS_SHM */
 #include "dix.h"
 #include "miline.h"
-#include "mfb.h"
 
 #define VFB_DEFAULT_WIDTH  1280
 #define VFB_DEFAULT_HEIGHT 1024
@@ -442,60 +442,6 @@ GetTimeInMillis()
 }
 #endif
 
-
-static Bool
-vfbMultiDepthCreateGC(GCPtr pGC)
-{
-    switch (vfbBitsPerPixel(pGC->depth))
-    {
-    case 1:  return mfbCreateGC (pGC);
-    case 8:  
-    case 16: 
-    case 32: return fbCreateGC (pGC);
-    default: return FALSE;
-    }
-}
-
-static void
-vfbMultiDepthGetSpans(
-    DrawablePtr		pDrawable,	/* drawable from which to get bits */
-    int			wMax,		/* largest value of all *pwidths */
-    register DDXPointPtr ppt,		/* points to start copying from */
-    int			*pwidth,	/* list of number of bits to copy */
-    int			nspans,		/* number of scanlines to copy */
-    char		*pdstStart)	/* where to put the bits */
-{
-    switch (pDrawable->bitsPerPixel) {
-    case 1:
-	mfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
-	break;
-    case 8:
-    case 16:
-    case 32:
-	fbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
-	break;
-    }
-    return;
-}
-
-static void
-vfbMultiDepthGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
-		      unsigned int format, unsigned long planeMask,
-		      char *pdstLine)
-{
-    switch (pDrawable->bitsPerPixel)
-    {
-    case 1:
-	mfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine);
-	break;
-    case 8:
-    case 16:
-    case 32:
-	fbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine);
-	break;
-    }
-}
-
 static ColormapPtr InstalledMaps[MAXSCREENS];
 
 static int
@@ -922,39 +868,38 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pbits = vfbAllocateFramebufferMemory(pvfb);
     if (!pbits) return FALSE;
 
-    /*    miSetPixmapDepths ();*/
+    miSetPixmapDepths ();
 
-    switch (pvfb->bitsPerPixel)
-    {
-    case 1:
-	ret = mfbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
-			    dpix, dpiy, pvfb->paddedWidth);
+    switch (pvfb->depth) {
+    case 15:
+	miSetVisualTypesAndMasks (15, (1 << TrueColor), 8, TrueColor,
+				  0x7c00, 0x03e0, 0x001f);
 	break;
-    case 8:
     case 16:
-    case 32:
-	ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
-			      dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
-#ifdef RENDER
-	if (ret && Render) 
-	    fbPictureInit (pScreen, 0, 0);
-#endif
+	miSetVisualTypesAndMasks (16, (1 << TrueColor), 8, TrueColor,
+				  0xf800, 0x07e0, 0x001f);
+	break;
+    case 24:
+	miSetVisualTypesAndMasks (24, (1 << TrueColor), 8, TrueColor,
+				  0xff0000, 0x00ff00, 0x0000ff);
 	break;
-    default:
-	return FALSE;
     }
+	
+    ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
+		       dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
+#ifdef RENDER
+    if (ret && Render) 
+	fbPictureInit (pScreen, 0, 0);
+#endif
 
     if (!ret) return FALSE;
 
-    miInitializeBackingStore(pScreen);
+    /* miInitializeBackingStore(pScreen); */
 
     /*
      * Circumvent the backing store that was just initialised.  This amounts
      * to a truely bizarre way of initialising SaveDoomedAreas and friends.
      */
-    pScreen->CreateGC = vfbMultiDepthCreateGC;
-    pScreen->GetImage = vfbMultiDepthGetImage;
-    pScreen->GetSpans = vfbMultiDepthGetSpans;
 
     pScreen->InstallColormap = vfbInstallColormap;
     pScreen->UninstallColormap = vfbUninstallColormap;
@@ -970,14 +915,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->blackPixel = pvfb->blackPixel;
     pScreen->whitePixel = pvfb->whitePixel;
 
-    if (pvfb->bitsPerPixel == 1)
-    {
-	ret = mfbCreateDefColormap(pScreen);
-    }
-    else
-    {
-	ret = fbCreateDefColormap(pScreen);
-    }
+    ret = fbCreateDefColormap(pScreen);
 
     miSetZeroLineBias(pScreen, pvfb->lineBias);
 
@@ -1008,7 +946,7 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 	vfbPixmapDepths[1] = TRUE;
 	vfbPixmapDepths[4] = TRUE;
 	vfbPixmapDepths[8] = TRUE;
-	vfbPixmapDepths[15] = TRUE;
+/*	vfbPixmapDepths[15] = TRUE; */
 	vfbPixmapDepths[16] = TRUE;
 	vfbPixmapDepths[24] = TRUE;
 	vfbPixmapDepths[32] = TRUE;

miext/cw/cw.c

@@ -40,6 +40,9 @@
 
 int cwGCIndex;
 int cwScreenIndex;
+#ifdef RENDER
+int cwPictureIndex;
+#endif
 static unsigned long cwGeneration = 0;
 extern GCOps cwGCOps;
 
@@ -96,22 +99,10 @@ static GCFuncs cwCheapGCFuncs = {
     cwCheapCopyClip,
 };
 
-static __inline__ Bool
-DrawableIsRedirWindow(DrawablePtr pDrawable)
-{
-    if (pDrawable->type != DRAWABLE_WINDOW)
-	return FALSE;
-    if (!((WindowPtr)pDrawable)->redirectDraw)
-	return FALSE;
-
-    ErrorF("yes!\n");
-    return TRUE;
-}
-
 DrawablePtr
 cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off)
 {
-    if (DrawableIsRedirWindow(pDrawable)) {
+    if (cwDrawableIsRedirWindow(pDrawable)) {
 	WindowPtr pWin = (WindowPtr)pDrawable;
 	PixmapPtr pPixmap = (*pDrawable->pScreen->GetWindowPixmap)(pWin);
 	*x_off = -pPixmap->screen_x;
@@ -154,22 +145,21 @@ cwCreateGCPrivate(GCPtr pGC, DrawablePtr pDrawable)
     pPriv->wrapFuncs = pGC->funcs;
     pGC->funcs = &cwGCFuncs;
     pGC->ops = &cwGCOps;
-    pGC->devPrivates[cwGCIndex].ptr = (pointer)pPriv;
+    setCwGC (pGC, pPriv);
     return TRUE;
 }
 
 static void
 cwDestroyGCPrivate(GCPtr pGC)
 {
-    cwGCRec *pPriv;
+    cwGCPtr pPriv;
 
-    pPriv = (cwGCRec *)pGC->devPrivates[cwGCIndex].ptr;
-    pGC->devPrivates[cwGCIndex].ptr = (pointer)pPriv->wrapFuncs;
+    pPriv = (cwGCPtr) getCwGC (pGC);
     pGC->funcs = &cwCheapGCFuncs;
     pGC->ops = pPriv->wrapOps;
     if (pPriv->pBackingGC)
 	FreeGC(pPriv->pBackingGC, (XID)0);
-    pGC->devPrivates[cwGCIndex].ptr = pPriv->wrapFuncs;
+    setCwGC (pGC, pPriv->wrapFuncs);
     xfree((pointer)pPriv);
 }
 
@@ -193,12 +183,12 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable)
     DrawablePtr		pBackingDrawable;
     int			x_off, y_off;
 
-    pPriv = (cwGCPtr)pGC->devPrivates[cwGCIndex].ptr;
+    pPriv = (cwGCPtr) getCwGC (pGC);
 
     FUNC_PROLOGUE(pGC, pPriv);
 
     if (pDrawable->serialNumber != pPriv->serialNumber &&
-	!DrawableIsRedirWindow(pDrawable))
+	!cwDrawableIsRedirWindow(pDrawable))
     {
 	/* The drawable is no longer a window with backing store, so kill the
 	 * private and go back to cheap functions.
@@ -350,7 +340,7 @@ cwCheapValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable)
      * re-wrap on return.
      */
     if (pDrawable->type == DRAWABLE_WINDOW &&
-	DrawableIsRedirWindow(pDrawable) &&
+cwDrawableIsRedirWindow(pDrawable) &&
 	cwCreateGCPrivate(pGC, pDrawable))
     {
 	(*pGC->funcs->ValidateGC)(pGC, stateChanges, pDrawable);
@@ -511,16 +501,16 @@ void
 miInitializeCompositeWrapper(ScreenPtr pScreen)
 {
     cwScreenPtr pScreenPriv;
-#ifdef RENDER
-    PictureScreenPtr ps = GetPictureScreen(pScreen);
-#endif
 
     if (cwGeneration != serverGeneration)
     {
 	cwScreenIndex = AllocateScreenPrivateIndex();
 	if (cwScreenIndex < 0)
 	    return;
 	cwGCIndex = AllocateGCPrivateIndex();
+#ifdef RENDER
+	cwPictureIndex = AllocatePicturePrivateIndex();
+#endif
 	cwGeneration = serverGeneration;
     }
     if (!AllocateGCPrivate(pScreen, cwGCIndex, 0))
@@ -539,19 +529,17 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
     pScreen->GetSpans = cwGetSpans;
     pScreen->CreateGC = cwCreateGC;
 
+    pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv;
+
 #ifdef RENDER
-    if (ps)
+    if (GetPictureScreen (pScreen))
     {
-	pScreenPriv->Composite = ps->Composite;
-	ps->Composite = cwComposite;
-	pScreenPriv->Glyphs = ps->Glyphs;
-	ps->Glyphs = cwGlyphs;
+	if (!cwInitializeRender (pScreen))
+	    /* FIXME */;
     }
 #endif
 
     ErrorF("Initialized composite wrapper\n");
-
-    pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv;
 }
 
 static Bool