From e21420c78621a9b2f87a32d2c6c0be3a7b38f336 Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Tue, 3 Jun 2008 18:27:49 -0400
Subject: [PATCH] Remove empty GC functions.

---
 hw/dmx/dmxgc.c      | 10 +++++-----
 hw/dmx/dmxgcops.c   | 48 +--------------------------------------------
 hw/dmx/dmxgcops.h   | 17 ----------------
 hw/dmx/dmxscrinit.c |  2 +-
 4 files changed, 7 insertions(+), 70 deletions(-)

diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c
index e867dd03b..ea40a594c 100644
--- a/hw/dmx/dmxgc.c
+++ b/hw/dmx/dmxgc.c
@@ -60,8 +60,8 @@ static GCFuncs dmxGCFuncs = {
 };
 
 static GCOps dmxGCOps = {
-    dmxFillSpans,
-    dmxSetSpans,
+    NULL, /* dmxFillSpans */
+    NULL, /* dmxSetSpans */
     dmxPutImage,
     dmxCopyArea,
     dmxCopyPlane,
@@ -77,9 +77,9 @@ static GCOps dmxGCOps = {
     dmxPolyText16,
     dmxImageText8,
     dmxImageText16,
-    dmxImageGlyphBlt,
-    dmxPolyGlyphBlt,
-    dmxPushPixels
+    NULL, /* dmxImageGlyphBlt */
+    NULL, /* dmxPolyGlyphBlt */
+    NULL, /* dmxPushPixels */
 };
 
 /** Initialize the GC on \a pScreen */
diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
index b85bfb69e..ecfe48113 100644
--- a/hw/dmx/dmxgcops.c
+++ b/hw/dmx/dmxgcops.c
@@ -72,22 +72,6 @@ do {									\
       (DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw))->offscreen ||		\
        !DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw))->window)))
 
-/** Fill spans -- this function should never be called. */
-void dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
-		  int nInit, DDXPointPtr pptInit, int *pwidthInit,
-		  int fSorted)
-{
-    /* Error -- this should never happen! */
-}
-
-/** Set spans -- this function should never be called. */
-void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
-		 char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
-		 int fSorted)
-{
-    /* Error -- this should never happen! */
-}
-
 /** Transfer \a pBits image to back-end server associated with \a
  *  pDrawable's screen.  If primitive subdivision optimization is
  *  enabled, then only transfer the sections of \a pBits that are
@@ -165,6 +149,7 @@ void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
 	dmxSync(dmxScreen, FALSE);
     } else {
 	/* Error -- this should not happen! */
+	FatalError ("XCreateImage failed\n");
     }
 }
 
@@ -515,29 +500,6 @@ void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
     dmxSync(dmxScreen, FALSE);
 }
 
-/** Image Glyph Blt -- this function should never be called. */
-void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-		      int x, int y, unsigned int nglyph,
-		      CharInfoPtr *ppci, pointer pglyphBase)
-{
-    /* Error -- this should never happen! */
-}
-
-/** Poly Glyph Blt -- this function should never be called. */
-void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-		     int x, int y, unsigned int nglyph,
-		     CharInfoPtr *ppci, pointer pglyphBase)
-{
-    /* Error -- this should never happen! */
-}
-
-/** Push Pixels -- this function should never be called. */
-void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-		   int w, int h, int x, int y)
-{
-    /* Error -- this should never happen! */
-}
-
 /**********************************************************************
  * Miscellaneous drawing commands
  */
@@ -627,11 +589,3 @@ void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 
     dmxSync(dmxScreen, FALSE);
 }
-
-/** Get Spans -- this function should never be called. */
-void dmxGetSpans(DrawablePtr pDrawable, int wMax,
-		 DDXPointPtr ppt, int *pwidth, int nspans,
-		 char *pdstStart)
-{
-    /* Error -- this should never happen! */
-}
diff --git a/hw/dmx/dmxgcops.h b/hw/dmx/dmxgcops.h
index da14d4d94..d79701625 100644
--- a/hw/dmx/dmxgcops.h
+++ b/hw/dmx/dmxgcops.h
@@ -37,12 +37,6 @@
 #ifndef DMXGCOPS_H
 #define DMXGCOPS_H
 
-extern void dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
-			 int nInit, DDXPointPtr pptInit, int *pwidthInit,
-			 int fSorted);
-extern void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
-			char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
-			int fSorted);
 extern void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
 			int depth, int x, int y, int w, int h,
 			int leftPad, int format, char *pBits);
@@ -76,20 +70,9 @@ extern void dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
 			  int x, int y, int count, char *chars);
 extern void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
 			   int x, int y, int count, unsigned short *chars);
-extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-			     int x, int y, unsigned int nglyph,
-			     CharInfoPtr *ppci, pointer pglyphBase);
-extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-			    int x, int y, unsigned int nglyph,
-			    CharInfoPtr *ppci, pointer pglyphBase);
-extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-			  int w, int h, int x, int y);
 
 extern void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 			unsigned int format, unsigned long planeMask,
 			char *pdstLine);
-extern void dmxGetSpans(DrawablePtr pDrawable, int wMax,
-			DDXPointPtr ppt, int *pwidth, int nspans,
-			char *pdstStart);
 
 #endif /* DMXGCOPS_H */
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index f56c71fa8..5889bf0f5 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -1551,7 +1551,7 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
 
 	/* Wrap Image functions */
 	DMX_WRAP(GetImage, dmxGetImage, dmxScreen, pScreen);
-	DMX_WRAP(GetSpans, dmxGetSpans, dmxScreen, pScreen);
+	DMX_WRAP(GetSpans, NULL, dmxScreen, pScreen);
 
 	/* Wrap Pixmap functions */
 	DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);