From: Jason Ekstrand Date: Mon, 31 Jul 2017 20:33:45 +0000 (-0700) Subject: i965: Only call create_for_planar_image for multiple planes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be0e13e49f0709b59cdf0f8618bac156bd8f3efd;p=mesa.git i965: Only call create_for_planar_image for multiple planes Before, we ended up always calling miptree_create_for_planar_image in almost all cases because most images have image->planar_format != NULL. This commit makes us only take that path if we have a multi-planar format. Reviewed-by: Daniel Stone --- diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 61a9c0c6627..7194111721b 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -885,12 +885,15 @@ intel_miptree_create_for_dri_image(struct brw_context *brw, enum isl_colorspace colorspace, bool is_winsys_image) { - if (image->planar_format && image->planar_format->nplanes > 0) { + if (image->planar_format && image->planar_format->nplanes > 1) { assert(colorspace == ISL_COLORSPACE_NONE || colorspace == ISL_COLORSPACE_YUV); return miptree_create_for_planar_image(brw, image, target); } + if (image->planar_format) + assert(image->planar_format->planes[0].dri_format == image->dri_format); + mesa_format format = image->format; switch (colorspace) { case ISL_COLORSPACE_NONE: