Skip to content

N
nx-libs
Commit 45f6e41c authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Render.c: make nxagentPrintFormat a NOP in normal mode

This way we can remove lots of #ifdef DEBUGs
parent 7d8323a4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 49 deletions
nx-X11/programs/Xserver/hw/nxagent/Render.c
View file @ 45f6e41c
...@@ -114,12 +114,8 @@ XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm); ...@@ -114,12 +114,8 @@ XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm);
BoxPtr nxagentGlyphsExtents; BoxPtr nxagentGlyphsExtents;
BoxPtr nxagentTrapezoidExtents; BoxPtr nxagentTrapezoidExtents;
#ifdef DEBUG
static void nxagentPrintFormat(XRenderPictFormat *pFormat); static void nxagentPrintFormat(XRenderPictFormat *pFormat);
#endif
/* /*
* From NXglyph.c. * From NXglyph.c.
*/ */
...@@ -730,12 +726,7 @@ int nxagentCreatePicture(PicturePtr pPicture, Mask mask) ...@@ -730,12 +726,7 @@ int nxagentCreatePicture(PicturePtr pPicture, Mask mask)
if (pPicture -> pFormat != NULL) if (pPicture -> pFormat != NULL)
{ {
pForm = nxagentMatchingFormats(pPicture -> pFormat); pForm = nxagentMatchingFormats(pPicture -> pFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
} }
if (pForm == NULL) if (pForm == NULL)
...@@ -1402,13 +1393,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ...@@ -1402,13 +1393,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL) if (maskFormat != NULL)
{ {
pForm = nxagentMatchingFormats(maskFormat); pForm = nxagentMatchingFormats(maskFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -1888,13 +1874,8 @@ void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ...@@ -1888,13 +1874,8 @@ void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL) if (maskFormat != NULL)
{ {
pForm = nxagentMatchingFormats(maskFormat); pForm = nxagentMatchingFormats(maskFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -2048,13 +2029,8 @@ void nxagentTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ...@@ -2048,13 +2029,8 @@ void nxagentTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL) if (maskFormat != NULL)
{ {
pForm = nxagentMatchingFormats(maskFormat); pForm = nxagentMatchingFormats(maskFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -2126,13 +2102,8 @@ void nxagentTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ...@@ -2126,13 +2102,8 @@ void nxagentTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL) if (maskFormat != NULL)
{ {
pForm = nxagentMatchingFormats(maskFormat); pForm = nxagentMatchingFormats(maskFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -2204,13 +2175,8 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ...@@ -2204,13 +2175,8 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL) if (maskFormat != NULL)
{ {
pForm = nxagentMatchingFormats(maskFormat); pForm = nxagentMatchingFormats(maskFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -2342,13 +2308,8 @@ void nxagentCreateGlyphSet(GlyphSetPtr pGly) ...@@ -2342,13 +2308,8 @@ void nxagentCreateGlyphSet(GlyphSetPtr pGly)
if (pGly -> format != NULL) if (pGly -> format != NULL)
{ {
pForm = nxagentMatchingFormats(pGly -> format); pForm = nxagentMatchingFormats(pGly -> format);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
if (pForm == NULL) if (pForm == NULL)
{ {
return; return;
...@@ -2622,14 +2583,12 @@ Bool nxagentPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) ...@@ -2622,14 +2583,12 @@ Bool nxagentPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
return TRUE; return TRUE;
} }
#ifdef DEBUG
static void nxagentPrintFormat(XRenderPictFormat *pFormat) static void nxagentPrintFormat(XRenderPictFormat *pFormat)
{ {
#ifdef DEBUG
if (pFormat == NULL) if (pFormat == NULL)
{ {
fprintf(stderr, "nxagentPrintFormat: WARNING! null pointer passed to function.\n"); fprintf(stderr, "nxagentPrintFormat: WARNING! null pointer passed to function.\n");
return; return;
} }
...@@ -2655,9 +2614,8 @@ static void nxagentPrintFormat(XRenderPictFormat *pFormat) ...@@ -2655,9 +2614,8 @@ static void nxagentPrintFormat(XRenderPictFormat *pFormat)
pFormat -> direct.blueMask, pFormat -> direct.blueMask,
pFormat -> direct.alpha, pFormat -> direct.alpha,
pFormat -> direct.alphaMask); pFormat -> direct.alphaMask);
}
#endif #endif
}
Bool nxagentFillGlyphSet(GlyphSetPtr pGly) Bool nxagentFillGlyphSet(GlyphSetPtr pGly)
{ {
...@@ -2848,12 +2806,7 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2) ...@@ -2848,12 +2806,7 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2)
if (pPicture -> pFormat) if (pPicture -> pFormat)
{ {
pForm = nxagentMatchingFormats(pPicture -> pFormat); pForm = nxagentMatchingFormats(pPicture -> pFormat);
#ifdef DEBUG
nxagentPrintFormat(pForm); nxagentPrintFormat(pForm);
#endif
} }
if (!pForm && pPicture->pSourcePict) if (!pForm && pPicture->pSourcePict)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment