summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2008-07-18 17:40:11 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2008-07-18 17:40:11 +0800
commitb4b7326717d3253656f9702fc04f06f8d210a6aa (patch)
tree46bfccca9a3caa84ee2d79f0c506d82e2ee2a6b1 /src/mesa/drivers/dri/intel/intel_mipmap_tree.c
parent3bfedb7ed4a35cfcc7187bc22314833ef1d96ec9 (diff)
intel: fix texture border issue. (bug #16697)
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_mipmap_tree.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 9205627813..1b645c7262 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -265,7 +265,10 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
{
/* Images with borders are never pulled into mipmap trees.
*/
- if (image->Border)
+ if (image->Border ||
+ ((image->_BaseFormat == GL_DEPTH_COMPONENT) &&
+ ((image->TexObject->WrapS == GL_CLAMP_TO_BORDER) ||
+ (image->TexObject->WrapT == GL_CLAMP_TO_BORDER))))
return GL_FALSE;
if (image->InternalFormat != mt->internal_format ||