Comment out debugging spew

3 files changed, 16 insertions, 7 deletions

diff --git a/src/qxl.h b/src/qxl.h
index d1f7190..9f7e516 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -827,9 +827,6 @@ static inline qxl_surface_t *get_surface (PixmapPtr pixmap)
 
 static inline void set_surface (PixmapPtr pixmap, qxl_surface_t *surface)
 {
-    if (surface == NULL)
-	ErrorF ("pixmap %p now has surface %p\n", pixmap, surface);
-    
     dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, surface);
 }
 
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 24d9e4b..4dc362b 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -675,7 +675,9 @@ qxl_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usage)
 				   -1, -1, -1,
 				   NULL);
 	
+#if 0
 	ErrorF ("Create pixmap %p with surface %p\n", pixmap, surface);
+#endif
 	set_surface (pixmap, surface);
 
 	qxl_surface_set_pixmap (surface, pixmap);
@@ -689,7 +691,9 @@ qxl_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usage)
 
 	pixmap = fbCreatePixmap (screen, w, h, depth, usage);
 
+#if 0
     	ErrorF ("Create pixmap %p without surface\n", pixmap);
+#endif
 }
     
     return pixmap;
@@ -709,7 +713,9 @@ qxl_destroy_pixmap (PixmapPtr pixmap)
     {
 	surface = get_surface (pixmap);
 
+#if 0
 	ErrorF ("- Destroy %p (had surface %p)\n", pixmap, surface);
+#endif
 	    
 	if (surface)
 	{
@@ -834,7 +840,9 @@ qxl_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if (!qxl->fb)
 	goto out;
     
+#if 0
     ErrorF ("allocated %d x %d  %p\n", pScrn->virtualX, pScrn->virtualY, qxl->fb);
+#endif
     
     pScreen->totalPixmapSize = 100;
 
diff --git a/src/qxl_surface.c b/src/qxl_surface.c
index f316e1c..67340a1 100644
--- a/src/qxl_surface.c
+++ b/src/qxl_surface.c
@@ -515,8 +515,6 @@ qxl_surface_set_pixmap (qxl_surface_t *surface, PixmapPtr pixmap)
     surface->pixmap = pixmap;
 
     assert (get_surface (pixmap) == surface);
-
-    ErrorF ("Surface %p now has pixmap %p\n", surface, pixmap);
 }
 
 static void
@@ -526,8 +524,6 @@ unlink_surface (qxl_surface_t *surface)
 	pixman_image_unref (surface->dev_image);
     if (surface->host_image)
 	pixman_image_unref (surface->host_image);
-
-    ErrorF ("Unlinking %p\n", surface);
     
     if (surface->prev)
 	surface->prev->next = surface->next;
@@ -784,7 +780,9 @@ qxl_surface_evacuate_all (qxl_screen_t *qxl)
     evacuated_surface_t *evacuated_surfaces = NULL;
     qxl_surface_t *s;
 
+#if 0
     ErrorF ("Evacuating all\n");
+#endif
 
     s = qxl->live_surfaces;
     while (s != NULL)
@@ -803,7 +801,9 @@ qxl_surface_evacuate_all (qxl_screen_t *qxl)
 
 	assert (get_surface (evacuated->pixmap) == s);
 	
+#if 0
 	ErrorF ("%d => %p\n", s->id, evacuated->pixmap);
+#endif
 	evacuated->Bpp = s->Bpp;
 	
 	s->host_image = NULL;
@@ -829,7 +829,9 @@ qxl_surface_replace_all (qxl_screen_t *qxl, void *data)
 {
     evacuated_surface_t *ev;
 
+#if 0
     ErrorF ("Replacing all\n");
+#endif
     qxl_surface_init (qxl);
     
     ev = data;
@@ -841,7 +843,9 @@ qxl_surface_replace_all (qxl_screen_t *qxl, void *data)
 	qxl_surface_t *surface;
 
 	surface = qxl_surface_create (qxl, width, height, ev->Bpp * 8);
+#if 0
 	ErrorF ("%d => %p\n", surface->id, ev->pixmap);
+#endif
 
 	assert (surface->host_image);
 	assert (surface->dev_image);