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>
Thu, 24 Sep 2009 13:58:17 +0000 (09:58 -0400)
We use t->bo for dri1 since r600 uses CS for dri1.

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

index 6436a5d7e9b48f7219a5785d180ec931f8a17804..f30dd112301d4fda6f78164697f897b6070b45a1 100644 (file)
@@ -565,9 +565,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];