Mesa (master): i965/miptree: Remove redundant check for null texture
Topi Pohjolainen
tpohjola at kemper.freedesktop.org
Fri Jan 27 07:33:10 UTC 2017
Module: Mesa
Branch: master
Commit: 26a9e039fdc63c04d5b3383d91c5eea1494c0f8f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26a9e039fdc63c04d5b3383d91c5eea1494c0f8f
Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date: Thu Dec 22 10:36:03 2016 +0200
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 <siglesias at igalia.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
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 f2debae..19f4f88 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;
More information about the mesa-commit
mailing list