Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.

Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.

2 files changed, 0 insertions, 31 deletions

diff --git a/miext/cw/cw.h b/miext/cw/cw.h
index 8e42ac256..a83949dc9 100644
--- a/miext/cw/cw.h
+++ b/miext/cw/cw.h
@@ -98,7 +98,6 @@ typedef struct {
     ValidatePictureProcPtr	ValidatePicture;
 
     CompositeProcPtr		Composite;
-    GlyphsProcPtr		Glyphs;
     CompositeRectsProcPtr	CompositeRects;
 
     TrapezoidsProcPtr		Trapezoids;
diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c
index 35416beb7..6e0c727c2 100644
--- a/miext/cw/cw_render.c
+++ b/miext/cw/cw_render.c
@@ -280,34 +280,6 @@ cwComposite (CARD8	op,
 }
 
 static void
-cwGlyphs (CARD8      op,
-	  PicturePtr pSrcPicture,
-	  PicturePtr pDstPicture,
-	  PictFormatPtr  maskFormat,
-	  INT16      xSrc,
-	  INT16      ySrc,
-	  int	nlists,
-	  GlyphListPtr   lists,
-	  GlyphPtr	*glyphs)
-{
-    ScreenPtr	pScreen = pDstPicture->pDrawable->pScreen;
-    cwPsDecl(pScreen);
-    cwSrcPictureDecl;
-    cwDstPictureDecl;
-    
-    cwPsUnwrap(Glyphs);
-    if (nlists)
-    {
-	lists->xOff += dst_picture_x_off;
-	lists->yOff += dst_picture_y_off;
-    }
-    (*ps->Glyphs) (op, pBackingSrcPicture, pBackingDstPicture, maskFormat,
-		   xSrc + src_picture_x_off, ySrc + src_picture_y_off,
-		   nlists, lists, glyphs);
-    cwPsWrap(Glyphs, cwGlyphs);
-}
-
-static void
 cwCompositeRects (CARD8		op,
 		  PicturePtr	pDstPicture,
 		  xRenderColor  *color,
@@ -470,7 +442,6 @@ cwInitializeRender (ScreenPtr pScreen)
     cwPsWrap(ChangePicture, cwChangePicture);
     cwPsWrap(ValidatePicture, cwValidatePicture);
     cwPsWrap(Composite, cwComposite);
-    cwPsWrap(Glyphs, cwGlyphs);
     cwPsWrap(CompositeRects, cwCompositeRects);
     cwPsWrap(Trapezoids, cwTrapezoids);
     cwPsWrap(Triangles, cwTriangles);
@@ -491,7 +462,6 @@ cwFiniRender (ScreenPtr pScreen)
     cwPsUnwrap(ChangePicture);
     cwPsUnwrap(ValidatePicture);
     cwPsUnwrap(Composite);
-    cwPsUnwrap(Glyphs);
     cwPsUnwrap(CompositeRects);
     cwPsUnwrap(Trapezoids);
     cwPsUnwrap(Triangles);