summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-09-09 01:41:46 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-09-24 09:58:17 -0400
commit65b01d449cc594e1c7e1a44c5d87fdc698300e9a (patch)
treef62670b1adf4d641633e6ef27daf7f255e8cdd39
parentb1e417413f2da8aad1872fa009949da101156431 (diff)
r600: fix ftp for dri1
We use t->bo for dri1 since r600 uses CS for dri1.
-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 6436a5d7e9..f30dd11230 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -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];