From 9c52aef7d7858058712c0f5926e324af052690df Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 16 Aug 2017 12:01:15 -0700 Subject: [PATCH] i965/screen: Report the correct number of image planes For non-CCS images, we were reporting just one plane even though they may have multiple in the case of YUV. Reviewed-by: Ben Widawsky Reviewed-by: Emil Velikov Reviewed-by: Daniel Stone --- src/mesa/drivers/dri/i965/intel_screen.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index b11c22d038e..1ec79088815 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -799,7 +799,14 @@ intel_query_image(__DRIimage *image, int attrib, int *value) case __DRI_IMAGE_ATTRIB_FOURCC: return intel_lookup_fourcc(image->dri_format, value); case __DRI_IMAGE_ATTRIB_NUM_PLANES: - *value = isl_drm_modifier_has_aux(image->modifier) ? 2 : 1; + if (isl_drm_modifier_has_aux(image->modifier)) { + assert(!image->planar_format || image->planar_format->nplanes == 1); + *value = 2; + } else if (image->planar_format) { + *value = image->planar_format->nplanes; + } else { + *value = 1; + } return true; case __DRI_IMAGE_ATTRIB_OFFSET: *value = image->offset; -- 2.30.2