diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
| commit | 9f273f109875cd9208d4c1c8f5939fb5e507c230 (patch) | |
| tree | 35c8adedcf44cf8eb3bddbb51b5efa766539a07b /src/mesa/drivers/dri/r600/r600_texstate.c | |
| parent | fab99092a0879531442d1dd20f971ae7eda824eb (diff) | |
| parent | aad0deee4b2d347bdfc536fe98938ed825bf0f6b (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
Diffstat (limited to 'src/mesa/drivers/dri/r600/r600_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_texstate.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c index fff6e74386..7d7e77d355 100644 --- a/src/mesa/drivers/dri/r600/r600_texstate.c +++ b/src/mesa/drivers/dri/r600/r600_texstate.c @@ -69,7 +69,7 @@ void r600UpdateTextureState(GLcontext * ctx) for (unit = 0; unit < R700_MAX_TEXTURE_UNITS; unit++) { texUnit = &ctx->Texture.Unit[unit]; t = radeon_tex_obj(ctx->Texture.Unit[unit]._Current); - + r700->textures[unit] = NULL; if (texUnit->_ReallyEnabled) { if (!t) continue; @@ -608,6 +608,11 @@ 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 (rmesa->radeon.radeonScreen->driScreen->dri2.enabled && + t->image_override && + t->bo) + return; + firstImage = t->base.Image[0][firstlevel]; if (!t->image_override) { |