From 26a9e039fdc63c04d5b3383d91c5eea1494c0f8f Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Thu, 22 Dec 2016 10:36:03 +0200 Subject: [PATCH] i965/miptree: Remove redundant check for null texture There exact same check earlier in brw_miptree_layout() which intel_miptree_create_layout() in turn calls unconditionally. Reviewed-by: Samuel Iglesias Gons\341lvez Reviewed-by: Jason Ekstrand Signed-off-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index f2debae444a..19f4f883d7e 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -631,13 +631,8 @@ miptree_create(struct brw_context *brw, first_level, last_level, width0, height0, depth0, num_samples, layout_flags); - /* - * pitch == 0 || height == 0 indicates the null texture - */ - if (!mt || !mt->total_width || !mt->total_height) { - intel_miptree_release(&mt); + if (!mt) return NULL; - } if (mt->tiling == (I915_TILING_Y | I915_TILING_X)) mt->tiling = I915_TILING_Y; -- 2.30.2