Module: Mesa Branch: 7.11 Commit: eaad245418116143534b0e887e218040f3c0dab0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eaad245418116143534b0e887e218040f3c0dab0
Author: Yuanhan Liu <[email protected]> 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 1a662e7c18cab98f1b122f6766faf338725de673) --- 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 4e711de..f7d96ab 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -137,7 +137,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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
