xf86-video-ati: Branch 'r6xx-r7xx-support'

[Alex Deucher]

 src/r600_exa.c                 |    8 ++++----
 src/r600_textured_videofuncs.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ec60ef094762901ede4df5cde55c3f162e8c667b
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Feb 11 13:05:27 2009 -0500

    R6xx/R7xx: be more verbose about what function ran out of VB space

diff --git a/src/r600_exa.c b/src/r600_exa.c
index a7d058b..8a2a009 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -263,7 +263,7 @@ R600Solid(PixmapPtr pPix, int x1, int y1, int x2, int y2)
     struct r6xx_solid_vertex *solid_vb = (pointer)((char*)accel_state->ib->address + (accel_state->ib->total / 2));
 
     if (((accel_state->vb_index + 3) * 8) > (accel_state->ib->total / 2)) {
-	ErrorF("Ran out of VB space!\n");
+	ErrorF("Solid: Ran out of VB space!\n");
 	return;
     }
 
@@ -606,7 +606,7 @@ R600AppendCopyVertex(ScrnInfoPtr pScrn,
     struct r6xx_copy_vertex vertex[3];
 
     if (((accel_state->vb_index + 3) * 16) > (accel_state->ib->total / 2)) {
-	ErrorF("Ran out of VB space!\n");
+	ErrorF("Copy: Ran out of VB space!\n");
 	return;
     }
 
@@ -1912,7 +1912,7 @@ static void R600Composite(PixmapPtr pDst,
 	xPointFixed maskTopLeft, maskTopRight, maskBottomLeft, maskBottomRight;
 
 	if (((accel_state->vb_index + 3) * 24) > (accel_state->ib->total / 2)) {
-	    ErrorF("Ran out of VB space!\n");
+	    ErrorF("Composite: Ran out of VB space!\n");
 	    return;
 	}
 
@@ -1973,7 +1973,7 @@ static void R600Composite(PixmapPtr pDst,
 	struct r6xx_comp_vertex vertex[3];
 
 	if (((accel_state->vb_index + 3) * 16) > (accel_state->ib->total / 2)) {
-	    ErrorF("Ran out of VB space!\n");
+	    ErrorF("Composite: Ran out of VB space!\n");
 	    return;
 	}
 
diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index 993a8d4..e30e227 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -408,7 +408,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 	struct r6xx_copy_vertex vertex[3];
 
 	if (((accel_state->vb_index + 3) * 16) > (accel_state->ib->total / 2)) {
-	    ErrorF("Ran out of VB space!\n");
+	    ErrorF("Xv: Ran out of VB space!\n");
 	    break;
 	}