From 9d72a759170ebf51d8f93fd00d3d9c37bd5dfb27 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 5 Mar 2009 19:00:17 +1000 Subject: radeon: use t->bo to figure out of settexbuffer override is in action --- src/mesa/drivers/dri/r200/r200_texstate.c | 4 ++++ src/mesa/drivers/dri/radeon/radeon_texstate.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3