From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Mon, 17 Mar 2008 08:50:20 +0000 (+0800)
Subject: intel: Remove an assertion from intel_miptree_create. TexImage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ed1fd5d8438e55fe24091844cdfccb0881306bc;p=mesa.git

intel: Remove an assertion from intel_miptree_create. TexImage
call with zero width/height/depth matches GL spec.
---

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 163183487a8..f42475e7d86 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -110,10 +110,12 @@ intel_miptree_create(struct intel_context *intel,
    mt = intel_miptree_create_internal(intel, target, internal_format,
 				      first_level, last_level, width0,
 				      height0, depth0, cpp, compress_byte);
-   if (!mt)
+   /*
+    * pitch == 0 indicates the null texture
+    */
+   if (!mt || mt->pitch)
       return NULL;
 
-   assert (mt->pitch);
    mt->region = intel_region_alloc(intel,
 				   mt->cpp, mt->pitch, mt->total_height);