intel: test cpp to ensure mipmap tree matches texture image.

2008-04-30 16:27:52 +08:00
parent aef4ca647d
commit d12fa3511d
1 changed files with 5 additions and 0 deletions
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -272,6 +272,11 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
       image->IsCompressed != mt->compressed)
      return GL_FALSE;

+   if (!image->IsCompressed &&
+       !mt->compressed &&
+       image->TexFormat->TexelBytes != mt->cpp)
+      return GL_FALSE;
+
   /* Test image dimensions against the base level image adjusted for
    * minification.  This will also catch images not present in the
    * tree, changed targets, etc.