summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-03-05 19:00:17 +1000
committerDave Airlie <airlied@linux.ie>2009-03-05 19:00:17 +1000
commit9d72a759170ebf51d8f93fd00d3d9c37bd5dfb27 (patch)
treeacf935c862eb348500f288fb50495a4c0b408d87
parenteba8008916503cea47c557398b009e2e2b546cb1 (diff)
radeon: use t->bo to figure out of settexbuffer override is in action
-rw-r--r--src/mesa/drivers/dri/r200/r200_texstate.c4
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_texstate.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index eac95b6659..4937b0665d 100644
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -1408,6 +1408,10 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t)
t->base.Image[0][t->mt->firstLevel];
GLint log2Width, log2Height, log2Depth, texelBytes;
+ if ( t->bo ) {
+ return;
+ }
+
log2Width = firstImage->WidthLog2;
log2Height = firstImage->HeightLog2;
log2Depth = firstImage->DepthLog2;
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index a24b5c8830..42356cd37b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -1006,7 +1006,7 @@ static GLboolean setup_hardware_state(r100ContextPtr rmesa, radeonTexObj *t, int
const struct gl_texture_image *firstImage;
GLint log2Width, log2Height, log2Depth, texelBytes;
- if ( t->image_override ) {
+ if ( t->bo ) {
return GL_TRUE;
}