Mesa (master): intel: Drop the speculatively-use-firstImage-mt in validation.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 6bdc31942138f4dff5a701f26fe186a6e2e92275
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6bdc31942138f4dff5a701f26fe186a6e2e92275

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 10 14:05:20 2011 -0800

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

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

---

 src/mesa/drivers/dri/intel/intel_tex_validate.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 81795e4..8537e7f 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;