fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-06 03:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove empty GC functions.

Browse source
This commit is contained in:
David Reveman 2008-06-03 18:27:49 -04:00
parent 5c716452ef
commit e21420c786
4 changed files with 7 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hw/dmx/dmxgc.c
View file

@ -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 */

48
hw/dmx/dmxgcops.c
View file

@ -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! */
}

17
hw/dmx/dmxgcops.h
View file

@ -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 */

2
hw/dmx/dmxscrinit.c
View file

@ -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);