Mesa (master): r600: fix ftp for dri1

[Alex Deucher]

Module: Mesa
Branch: master
Commit: da9ed257a3b47c97ac557da17c32cf271190a407
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da9ed257a3b47c97ac557da17c32cf271190a407

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Sep  9 01:41:46 2009 -0400

r600: fix ftp for dri1

We use t->bo for dri1 since r600 uses CS for dri1.

---

 src/mesa/drivers/dri/r600/r600_texstate.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index ff4ef1e..f1fefd8 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -608,9 +608,10 @@ static void setup_hardware_state(context_t *rmesa, struct gl_texture_object *tex
 	int firstlevel = t->mt ? t->mt->firstLevel : 0;
 	GLuint uTexelPitch, row_align;
 
-	if ( t->bo ) {
-		return GL_TRUE;
-	}
+	if (rmesa->radeon.radeonScreen->driScreen->dri2.enabled &&
+	    t->image_override &&
+	    t->bo)
+		return;
 
 	firstImage = t->base.Image[0][firstlevel];