r600: fix ftp for dri1
authorAlex Deucher <alexdeucher@gmail.com>
Wed, 9 Sep 2009 05:41:46 +0000 (01:41 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Wed, 9 Sep 2009 05:43:17 +0000 (01:43 -0400)
We use t->bo for dri1 since r600 uses CS for dri1.

src/mesa/drivers/dri/r600/r600_texstate.c

index ff4ef1ee74cbf80f5c4ea090b570d2b544c6b1b5..f1fefd8f5060bc3b5be231e0483e656ceb810f38 100644 (file)
@@ -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];