From 76dd385fed7fc9b5303fb0b7707a49c5500d7748 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 21 Sep 2006 10:06:18 +0000 Subject: [PATCH] Catch a couple of cases where we would have to delete and recreate the miptree object. --- src/mesa/drivers/dri/i965/intel_tex_validate.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index 5f65242..91ae097 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -166,12 +166,15 @@ GLuint intel_finalize_mipmap_tree( struct intel_context *intel, * target, imageFormat, etc. */ if (intelObj->mt && - (intelObj->mt->first_level != intelObj->firstLevel || - intelObj->mt->last_level != intelObj->lastLevel || + (intelObj->mt->target != intelObj->base.Target || intelObj->mt->internal_format != firstImage->InternalFormat || + intelObj->mt->first_level != intelObj->firstLevel || + intelObj->mt->last_level != intelObj->lastLevel || intelObj->mt->width0 != firstImage->Width || intelObj->mt->height0 != firstImage->Height || - intelObj->mt->depth0 != firstImage->Depth)) + intelObj->mt->depth0 != firstImage->Depth || + intelObj->mt->cpp != firstImage->TexFormat->TexelBytes || + intelObj->mt->compressed != firstImage->IsCompressed)) { intel_miptree_destroy(intel, intelObj->mt); intelObj->mt = NULL; -- 2.7.4