xf86-video-intel: 2 commits - configure.ac src/sna/sna_accel.c src/sna/sna.h

[Chris Wilson]

 configure.ac        |    7 +++++--
 src/sna/sna.h       |    2 +-
 src/sna/sna_accel.c |   12 ++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 8ee53cc7449de7df294f49d089ff1d6b2e944323
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 9 13:05:19 2011 +0100

    sna: Debugging compile fix
    
    Still not enough coffee this morning.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1640e79..975799e 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1542,7 +1542,7 @@ sna_fill_spans(DrawablePtr drawable, GCPtr gc, int n,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
 	}
 
@@ -1737,7 +1737,7 @@ sna_poly_point(DrawablePtr drawable, GCPtr gc,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
 	}
 
@@ -1956,7 +1956,7 @@ sna_poly_line(DrawablePtr drawable, GCPtr gc,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
 	}
 
@@ -2169,7 +2169,7 @@ sna_poly_segment(DrawablePtr drawable, GCPtr gc, int n, xSegment *seg)
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
 	}
 
@@ -2652,7 +2652,7 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
 		return;
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
 	}
 
@@ -2960,7 +2960,7 @@ sna_copy_window(WindowPtr win, DDXPointRec origin, RegionPtr src)
 	DBG(("%s origin=(%d, %d)\n", __FUNCTION__, origin.x, origin.y));
 
 	if (sna->kgem.wedged) {
-		DBG(("%s: fallback -- wedged\n"));
+		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		sna_pixmap_move_to_cpu(pixmap, true);
 		fbCopyWindow(win, origin, src);
 		return;
commit 6f59d7d19053fed4e9d6402a5f03bc8a62cb56af
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 9 12:59:59 2011 +0100

    sna: Use --enable-debug=full to enable extremely verbose debugging
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 1776489..31106af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,13 +224,16 @@ if test "x$SNA" != xno; then
 fi
 AC_MSG_RESULT([$sna_drivers])
 
-AM_CONDITIONAL(DEBUG, test x$DEBUG = xyes)
+AM_CONDITIONAL(DEBUG, test x$DEBUG != xno)
 if test "x$DEBUG" = xno; then
 	AC_DEFINE(NDEBUG,1,[Disable internal debugging])
 fi
-if test "x$DEBUG" = xyes; then
+if test "x$DEBUG" != xno; then
 	AC_DEFINE(HAS_EXTRA_DEBUG,1,[Enable additional debugging])
 fi
+if test "x$DEBUG" = xfull; then
+	AC_DEFINE(HAS_DEBUG_FULL,1,[Enable all debugging])
+fi
 
 AC_CHECK_HEADERS([sys/timerfd.h])
 
diff --git a/src/sna/sna.h b/src/sna/sna.h
index ea2422a..d963d9c 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -70,7 +70,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define DBG(x)
 
-#define DEBUG_ALL 0
+#define DEBUG_ALL (HAS_DEBUG_FULL || 0)
 #define DEBUG_ACCEL (DEBUG_ALL || 0)
 #define DEBUG_BATCH (DEBUG_ALL || 0)
 #define DEBUG_BLT (DEBUG_ALL || 0)