Mesa (master): intel: More reverting of the sw fallback for depth texture border color.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Sep 24 18:19:08 2010 -0700

intel: More reverting of the sw fallback for depth texture border color.

The rest was done with 9aec1288eeae8e87adc9a99f377be536892941b2

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 4732efd..03aba58 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -73,10 +73,7 @@ guess_and_alloc_mipmap_tree(struct intel_context *intel,
 
    DBG("%s\n", __FUNCTION__);
 
-   if (intelImage->base.Border ||
-       ((intelImage->base._BaseFormat == GL_DEPTH_COMPONENT) && 
-        ((intelObj->base.WrapS == GL_CLAMP_TO_BORDER) ||
-         (intelObj->base.WrapT == GL_CLAMP_TO_BORDER))))
+   if (intelImage->base.Border)
       return;
 
    if (intelImage->level > intelObj->base.BaseLevel &&