From: Eric Anholt <eric@anholt.net>
Date: Mon, 10 Jan 2011 22:05:20 +0000 (-0800)
Subject: intel: Drop the speculatively-use-firstImage-mt in validation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bdc31942138f4dff5a701f26fe186a6e2e92275;p=mesa.git

intel: Drop the speculatively-use-firstImage-mt in validation.

It's been replaced by just setting texObj->mt to image->mt at TexImage
time.
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 81795e48d9a..8537e7f3682 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -96,23 +96,6 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
       return GL_FALSE;
    }
 
-
-   /* If both firstImage and intelObj have a tree which can contain
-    * all active images, favour firstImage.  Note that because of the
-    * completeness requirement, we know that the image dimensions
-    * will match.
-    */
-   if (firstImage->mt &&
-       firstImage->mt != intelObj->mt &&
-       firstImage->mt->first_level <= tObj->BaseLevel &&
-       firstImage->mt->last_level >= intelObj->_MaxLevel) {
-
-      if (intelObj->mt)
-         intel_miptree_release(intel, &intelObj->mt);
-
-      intel_miptree_reference(&intelObj->mt, firstImage->mt);
-   }
-
    if (_mesa_is_format_compressed(firstImage->base.TexFormat)) {
       comp_byte = intel_compressed_num_bytes(firstImage->base.TexFormat);
       cpp = comp_byte;