From: Eric Anholt <eric@anholt.net>
Date: Thu, 5 Nov 2009 01:31:01 +0000 (-0800)
Subject: intel: Finish removing the fallback code for bug #16697.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1166294d1dd253da63620235100a11f1981aa86d;p=mesa.git

intel: Finish removing the fallback code for bug #16697.

I fixed it properly as of 7216679c1998b49ff5b08e6b43f8d5779415bf54.
---

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index e082ebc799c..abb3024bfbb 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -321,12 +321,8 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
    struct intel_texture_image *intelImage = intel_texture_image(image);
    GLuint level = intelImage->level;
 
-   /* Images with borders are never pulled into mipmap trees. 
-    */
-   if (image->Border ||
-       ((image->_BaseFormat == GL_DEPTH_COMPONENT) &&
-        ((image->TexObject->WrapS == GL_CLAMP_TO_BORDER) ||
-         (image->TexObject->WrapT == GL_CLAMP_TO_BORDER)))) 
+   /* Images with borders are never pulled into mipmap trees. */
+   if (image->Border)
       return GL_FALSE;
 
    if (image->InternalFormat != mt->internal_format ||