From: Daniel Stone Date: Fri, 21 Jul 2017 12:55:42 +0000 (+0100) Subject: st/dri2: Return invalid modifier when no driver support X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45383d32d4fd0265a7133704cb3e6c15620177cd;p=mesa.git st/dri2: Return invalid modifier when no driver support Always initialise whandle.modifier for DRIImage modifier queries, so if the driver doesn't support it then we return false for the query. Signed-off-by: Daniel Stone Reviewed-by: Marek Olšák Fixes: d33fe8b84e45 ("st/dri: enable DRIimage modifier queries") --- diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 3ebed7a98b4..0cbc76f7f8b 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1239,16 +1239,22 @@ dri2_query_image(__DRIimage *image, int attrib, int *value) return GL_TRUE; case __DRI_IMAGE_ATTRIB_MODIFIER_UPPER: whandle.type = DRM_API_HANDLE_TYPE_KMS; + whandle.modifier = DRM_FORMAT_MOD_INVALID; if (!image->texture->screen->resource_get_handle(image->texture->screen, NULL, image->texture, &whandle, usage)) return GL_FALSE; + if (whandle.modifier == DRM_FORMAT_MOD_INVALID) + return GL_FALSE; *value = (whandle.modifier >> 32) & 0xffffffff; return GL_TRUE; case __DRI_IMAGE_ATTRIB_MODIFIER_LOWER: whandle.type = DRM_API_HANDLE_TYPE_KMS; + whandle.modifier = DRM_FORMAT_MOD_INVALID; if (!image->texture->screen->resource_get_handle(image->texture->screen, NULL, image->texture, &whandle, usage)) return GL_FALSE; + if (whandle.modifier == DRM_FORMAT_MOD_INVALID) + return GL_FALSE; *value = whandle.modifier & 0xffffffff; return GL_TRUE; default: