[Mesa-dev] [PATCH 12/15] anv: add VkFormat field as part of anv_format

[Lionel Landwerlin]

On 27/11/2018 10:53, Tapani Pälli wrote:
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>


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


> ---
>   src/intel/vulkan/anv_formats.c | 4 ++++
>   src/intel/vulkan/anv_private.h | 1 +
>   2 files changed, 5 insertions(+)
>
> diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
> index 6e7807579df..f27456fa41d 100644
> --- a/src/intel/vulkan/anv_formats.c
> +++ b/src/intel/vulkan/anv_formats.c
> @@ -54,6 +54,7 @@
>              .aspect = VK_IMAGE_ASPECT_COLOR_BIT, \
>            }, \
>         }, \
> +      .vk_format = __vk_fmt, \
>         .n_planes = 1, \
>      }
>   
> @@ -94,6 +95,7 @@
>              .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, \
>            }, \
>         }, \
> +      .vk_format = __vk_fmt, \
>         .n_planes = 2, \
>      }
>   
> @@ -102,6 +104,7 @@
>         .planes = { \
>            { .isl_format = ISL_FORMAT_UNSUPPORTED, }, \
>         }, \
> +      .vk_format = VK_FORMAT_UNDEFINED, \
>      }
>   
>   #define y_plane(__plane, __hw_fmt, __swizzle, __ycbcr_swizzle, dhs, dvs) \
> @@ -127,6 +130,7 @@
>         .planes = { \
>            __VA_ARGS__, \
>         }, \
> +      .vk_format = __vk_fmt, \
>         .n_planes = __n_planes, \
>         .can_ycbcr = true, \
>      }
> diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
> index 893c5da7abc..84678de37f8 100644
> --- a/src/intel/vulkan/anv_private.h
> +++ b/src/intel/vulkan/anv_private.h
> @@ -2562,6 +2562,7 @@ struct anv_format_plane {
>   
>   struct anv_format {
>      struct anv_format_plane planes[3];
> +   VkFormat vk_format;
>      uint8_t n_planes;
>      bool can_ycbcr;
>   };