Mesa (master): intel: fix the wrong code to detect null texture.

Yuanhan Liu yliu at kemper.freedesktop.org
Thu Sep 22 22:40:54 PDT 2011


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

Author: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Date:   Fri Sep 23 13:34:26 2011 +0800

intel: fix the wrong code to detect null texture.

There is already comments show how to detect a null texture. Fix the
code to match the comments.

This would fix the oglc divzero(basic.texQOrWEqualsZero) and
divzero(basic.texTrivialPrim) test case fail.

Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    2 +-
 1 files changed, 1 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 b77c5d7..18427b5 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -136,7 +136,7 @@ intel_miptree_create(struct intel_context *intel,
    /*
     * pitch == 0 || height == 0  indicates the null texture
     */
-   if (!mt || !mt->total_height) {
+   if (!mt || !mt->total_width || !mt->total_height) {
       free(mt);
       return NULL;
    }



More information about the mesa-commit mailing list