From: Eric Anholt <eric@anholt.net>
Date: Sat, 25 Sep 2010 01:19:08 +0000 (-0700)
Subject: intel: More reverting of the sw fallback for depth texture border color.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86ad797be4b9b2768f1c28bb5ac3ae6f9a41794a;p=mesa.git

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

The rest was done with 9aec1288eeae8e87adc9a99f377be536892941b2
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 4732efd7d79..03aba58e107 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 &&