Mesa (master): intel: Remove duplicated teximage miptree to object miptree promotion.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov  2 20:36:47 2010 -0700

intel: Remove duplicated teximage miptree to object miptree promotion.

intel_finalize_mipmap_tree() does this optimization too, just more
aggressively.

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 05d72ba..50fe9bd 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -343,21 +343,6 @@ intelTexImage(struct gl_context * ctx,
       texImage->Data = NULL;
    }
 
-   /* If this is the only texture image in the tree, could call
-    * bmBufferData with NULL data to free the old block and avoid
-    * waiting on any outstanding fences.
-    */
-   if (intelObj->mt &&
-       intelObj->mt->first_level == level &&
-       intelObj->mt->last_level == level &&
-       intelObj->mt->target != GL_TEXTURE_CUBE_MAP_ARB &&
-       !intel_miptree_match_image(intelObj->mt, &intelImage->base)) {
-
-      DBG("release it\n");
-      intel_miptree_release(intel, &intelObj->mt);
-      assert(!intelObj->mt);
-   }
-
    if (!intelObj->mt) {
       guess_and_alloc_mipmap_tree(intel, intelObj, intelImage, pixels == NULL);
       if (!intelObj->mt) {