aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-09-05 19:04:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-09-29 17:15:25 +0200
commit45f6e41c4a213f195cbf2ba8a45611289279e64c (patch)
treee58ebfd481ba35f0eb7b505b179be6d5dcc9564f /nx-X11
parent7d8323a4ad3aa2719fedb69bc765ce33c9141b5e (diff)
downloadnx-libs-45f6e41c4a213f195cbf2ba8a45611289279e64c.tar.gz
nx-libs-45f6e41c4a213f195cbf2ba8a45611289279e64c.tar.bz2
nx-libs-45f6e41c4a213f195cbf2ba8a45611289279e64c.zip
Render.c: make nxagentPrintFormat a NOP in normal mode
This way we can remove lots of #ifdef DEBUGs
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c51
1 files changed, 2 insertions, 49 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index b82db7f91..fcc418cc0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -114,12 +114,8 @@ XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm);
BoxPtr nxagentGlyphsExtents;
BoxPtr nxagentTrapezoidExtents;
-#ifdef DEBUG
-
static void nxagentPrintFormat(XRenderPictFormat *pFormat);
-#endif
-
/*
* From NXglyph.c.
*/
@@ -730,12 +726,7 @@ int nxagentCreatePicture(PicturePtr pPicture, Mask mask)
if (pPicture -> pFormat != NULL)
{
pForm = nxagentMatchingFormats(pPicture -> pFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
-
- #endif
}
if (pForm == NULL)
@@ -1402,13 +1393,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL)
{
pForm = nxagentMatchingFormats(maskFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -1888,13 +1874,8 @@ void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL)
{
pForm = nxagentMatchingFormats(maskFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -2048,13 +2029,8 @@ void nxagentTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL)
{
pForm = nxagentMatchingFormats(maskFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -2126,13 +2102,8 @@ void nxagentTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL)
{
pForm = nxagentMatchingFormats(maskFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -2204,13 +2175,8 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (maskFormat != NULL)
{
pForm = nxagentMatchingFormats(maskFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -2342,13 +2308,8 @@ void nxagentCreateGlyphSet(GlyphSetPtr pGly)
if (pGly -> format != NULL)
{
pForm = nxagentMatchingFormats(pGly -> format);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
- #endif
-
if (pForm == NULL)
{
return;
@@ -2622,14 +2583,12 @@ Bool nxagentPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
return TRUE;
}
-#ifdef DEBUG
-
static void nxagentPrintFormat(XRenderPictFormat *pFormat)
{
+#ifdef DEBUG
if (pFormat == NULL)
{
fprintf(stderr, "nxagentPrintFormat: WARNING! null pointer passed to function.\n");
-
return;
}
@@ -2655,9 +2614,8 @@ static void nxagentPrintFormat(XRenderPictFormat *pFormat)
pFormat -> direct.blueMask,
pFormat -> direct.alpha,
pFormat -> direct.alphaMask);
-}
-
#endif
+}
Bool nxagentFillGlyphSet(GlyphSetPtr pGly)
{
@@ -2848,12 +2806,7 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2)
if (pPicture -> pFormat)
{
pForm = nxagentMatchingFormats(pPicture -> pFormat);
-
- #ifdef DEBUG
-
nxagentPrintFormat(pForm);
-
- #endif
}
if (!pForm && pPicture->pSourcePict)