From bb0721aea4dd1607b873dd03cffe391ed658a713 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 13 Nov 2018 09:57:09 +0200 Subject: [PATCH] anv: add VkFormat field as part of anv_format MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin --- 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 eaab6088a7e..eb9893294d1 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 cd24714f93e..903931472da 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -2555,6 +2555,7 @@ struct anv_format_plane { struct anv_format { struct anv_format_plane planes[3]; + VkFormat vk_format; uint8_t n_planes; bool can_ycbcr; }; -- 2.30.2