summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2009-09-09 01:41:46 -0400
committerAlex Deucher <[email protected]>2009-09-09 01:43:17 -0400
commitda9ed257a3b47c97ac557da17c32cf271190a407 (patch)
treebb01ab03dbb48e091f28096ead74890f72fee7bc /src/mesa/drivers/dri
parentca246dd186f9590f6d67038832faceb522138c20 (diff)
r600: fix ftp for dri1
We use t->bo for dri1 since r600 uses CS for dri1.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/r600/r600_texstate.c7
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 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];