Module: Mesa
Branch: mesa_7_6_branch
Commit: 65b01d449cc594e1c7e1a44c5d87fdc698300e9a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=65b01d449cc594e1c7e1a44c5d87fdc698300e9a
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Wed Sep 9 01:41:46 2009 -0400
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 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 6436a5d..f30dd11 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];
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
