- Add a new Render function, CopyPicture, which will update a picture with

    the flagged bits from a source picture. Approved in principle by
    keithp.
- Use CopyPicture and SetTransform to update most of the backing picture's
    state in the composite wrapper. Filters are still missing.
- Don't allocate a picture private, now that we calculate clipping properly
    and don't need the serialNumber or stateChanges.
- Use the format of the source pixmap rather than generating the format
    from the window's visual.
- Wrap the rest of the Render primitives that were stubbed out before.

1 files changed, 1 insertions, 9 deletions

diff --git a/miext/cw/cw.h b/miext/cw/cw.h
index 014cfd4bb..0fb626d11 100644
--- a/miext/cw/cw.h
+++ b/miext/cw/cw.h
@@ -44,16 +44,8 @@ extern int cwGCIndex;
 #define getCwGC(pGC)	((cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr)
 #define setCwGC(pGC,p)	((pGC)->devPrivates[cwGCIndex].ptr = (pointer) (p))
 
-typedef struct {
-    PicturePtr	    pBackingPicture;
-    unsigned long   serialNumber;   /* clientClip computed time */
-    unsigned long   stateChanges;   /* changes in parent picture since last copy */
-} cwPictureRec, *cwPicturePtr;
-
 extern int  cwPictureIndex;
 
-#define getCwPicture(pPicture)	    ((cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr)
-
 #define cwDrawableIsRedirWindow(pDraw)					\
 	((pDraw)->type == DRAWABLE_WINDOW &&				\
 	 ((*(pDraw)->pScreen->GetWindowPixmap)((WindowPtr)(pDraw)) !=	\
@@ -142,7 +134,7 @@ cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off);
 
 /* cw_render.c */
 
-Bool
+void
 cwInitializeRender (ScreenPtr pScreen);
 
 /* cw.c */