removing all debugging output from the default build :)

9 files changed, 48 insertions, 42 deletions

diff --git a/exa/exa.c b/exa/exa.c
index c2d0db063..73f1d932d 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index c2d0db063..73f1d932d 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/exa/exa_migration.c b/exa/exa_migration.c
index c2d0db063..73f1d932d 100644
--- a/exa/exa_migration.c
+++ b/exa/exa_migration.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 53931d84b..d62db9016 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -349,7 +349,9 @@ exaOffscreenInit (ScreenPtr pScreen)
     area->next = NULL;
     area->score = 0;
 
+#if DEBUG_OFFSCREEN
     ErrorF("============ initial memory block of %d\n", area->size);
+#endif
 
     /* Add it to the free areas */
     pExaScr->info->card.offScreenAreas = area;
diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c
index c2d0db063..73f1d932d 100644
--- a/hw/xfree86/exa/exa.c
+++ b/hw/xfree86/exa/exa.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c
index c2d0db063..73f1d932d 100644
--- a/hw/xfree86/exa/exa_accel.c
+++ b/hw/xfree86/exa/exa_accel.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c
index c2d0db063..73f1d932d 100644
--- a/hw/xfree86/exa/exa_migration.c
+++ b/hw/xfree86/exa/exa_migration.c
@@ -226,16 +226,16 @@ exaMoveInPixmap (PixmapPtr pPixmap)
     exaWaitSync (pPixmap->drawable.pScreen);
 
     i = pPixmap->drawable.height;
-    ErrorF("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
-           dst, src, dst_pitch, src_pitch,
-           i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset);
+    DBG_PIXMAP(("dst = %p, src = %p,(%d, %d) height = %d, mem_base = %p, offset = %d\n",
+                dst, src, dst_pitch, src_pitch,
+                i, pExaScr->info->card.memoryBase, ExaGetPixmapPriv(pPixmap)->area->offset));
 
     while (i--) {
 	memcpy (dst, src, bytes);
 	dst += dst_pitch;
 	src += src_pitch;
     }
-    ErrorF("done\n");
+    DBG_PIXMAP("done\n");
 }
 
 static void
@@ -1145,8 +1145,8 @@ exaDriverInit (ScreenPtr		pScreen,
 	    return FALSE;
     }
 
-    ErrorF("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
-           pExaScr->info->card.memorySize);
+    DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
+                pExaScr->info->card.memorySize));
     if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
 	if (!exaOffscreenInit (pScreen))
             return FALSE;
@@ -1238,7 +1238,7 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 {
     static Bool Initialised = FALSE;
 
-    ErrorF("exa setup\n");
+    DBG_PIXMAP("exa setup\n");
     if (!Initialised) {
 	Initialised = TRUE;
 #ifndef REMOVE_LOADER_CHECK_MODULE_INFO
diff --git a/hw/xfree86/exa/exa_offscreen.c b/hw/xfree86/exa/exa_offscreen.c
index 53931d84b..d62db9016 100644
--- a/hw/xfree86/exa/exa_offscreen.c
+++ b/hw/xfree86/exa/exa_offscreen.c
@@ -349,7 +349,9 @@ exaOffscreenInit (ScreenPtr pScreen)
     area->next = NULL;
     area->score = 0;
 
+#if DEBUG_OFFSCREEN
     ErrorF("============ initial memory block of %d\n", area->size);
+#endif
 
     /* Add it to the free areas */
     pExaScr->info->card.offScreenAreas = area;
diff --git a/hw/xfree86/exa/exaoffscreen.c b/hw/xfree86/exa/exaoffscreen.c
index 53931d84b..d62db9016 100644
--- a/hw/xfree86/exa/exaoffscreen.c
+++ b/hw/xfree86/exa/exaoffscreen.c
@@ -349,7 +349,9 @@ exaOffscreenInit (ScreenPtr pScreen)
     area->next = NULL;
     area->score = 0;
 
+#if DEBUG_OFFSCREEN
     ErrorF("============ initial memory block of %d\n", area->size);
+#endif
 
     /* Add it to the free areas */
     pExaScr->info->card.offScreenAreas = area;