From da9ed257a3b47c97ac557da17c32cf271190a407 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 9 Sep 2009 01:41:46 -0400
Subject: 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 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index ff4ef1ee74c..f1fefd8f506 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];
 
-- 
cgit v1.2.3