[Mesa-dev] [RFC PATCH v1 16/30] anv: Refactor anv_get_format_plane() - explicit unsupported

[Lionel Landwerlin]

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

On 07/11/17 14:47, Chad Versace wrote:
> The same local variable, 'plane_format', was returned on success *and*
> failure. Be more explicit in distinguishing the two cases: return
> 'plane_format' on success and return 'unsupported' on failure.
>
> This simplifies the diff in upcoming patches for
> VK_EXT_image_drm_format_modifier.
> ---
>   src/intel/vulkan/anv_formats.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
> index 25d34fcadc1..810f26cc750 100644
> --- a/src/intel/vulkan/anv_formats.c
> +++ b/src/intel/vulkan/anv_formats.c
> @@ -412,17 +412,17 @@ anv_get_format_plane(const struct gen_device_info *devinfo, VkFormat vk_format,
>                        VkImageAspectFlagBits aspect, VkImageTiling tiling)
>   {
>      const struct anv_format *format = anv_get_format(vk_format);
> -   struct anv_format_plane plane_format = {
> +   const struct anv_format_plane unsupported = {
>         .isl_format = ISL_FORMAT_UNSUPPORTED,
>      };
>   
>      if (format == NULL)
> -      return plane_format;
> +      return unsupported;
>   
>      uint32_t plane = anv_image_aspect_to_plane(vk_format_aspects(vk_format), aspect);
> -   plane_format = format->planes[plane];
> +   struct anv_format_plane plane_format = format->planes[plane];
>      if (plane_format.isl_format == ISL_FORMAT_UNSUPPORTED)
> -      return plane_format;
> +      return unsupported;
>   
>      if (aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) {
>         assert(vk_format_aspects(vk_format) &