From ea53f76d7b96cb32bde493a7c7548bf9c8c794f3 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 2 Nov 2018 10:21:20 +0000 Subject: [PATCH] anv: move helper function internally It's only used in anv_image.c Signed-off-by: Lionel Landwerlin Reviewed-by: Eric Engestrom Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_image.c | 22 ++++++++++++++++++++++ src/intel/vulkan/anv_private.h | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 4a0284c..4003ac2 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1245,6 +1245,28 @@ remap_aspect_flags(VkImageAspectFlags view_aspects) return view_aspects; } +static uint32_t +anv_image_aspect_get_planes(VkImageAspectFlags aspect_mask) +{ + uint32_t planes = 0; + + if (aspect_mask & (VK_IMAGE_ASPECT_COLOR_BIT | + VK_IMAGE_ASPECT_DEPTH_BIT | + VK_IMAGE_ASPECT_STENCIL_BIT | + VK_IMAGE_ASPECT_PLANE_0_BIT)) + planes++; + if (aspect_mask & VK_IMAGE_ASPECT_PLANE_1_BIT) + planes++; + if (aspect_mask & VK_IMAGE_ASPECT_PLANE_2_BIT) + planes++; + + if ((aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) != 0 && + (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0) + planes++; + + return planes; +} + VkResult anv_CreateImageView(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index b6e3d1a..62c5632 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -2584,28 +2584,6 @@ anv_image_aspect_to_plane(VkImageAspectFlags image_aspects, } } -static inline uint32_t -anv_image_aspect_get_planes(VkImageAspectFlags aspect_mask) -{ - uint32_t planes = 0; - - if (aspect_mask & (VK_IMAGE_ASPECT_COLOR_BIT | - VK_IMAGE_ASPECT_DEPTH_BIT | - VK_IMAGE_ASPECT_STENCIL_BIT | - VK_IMAGE_ASPECT_PLANE_0_BIT)) - planes++; - if (aspect_mask & VK_IMAGE_ASPECT_PLANE_1_BIT) - planes++; - if (aspect_mask & VK_IMAGE_ASPECT_PLANE_2_BIT) - planes++; - - if ((aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) != 0 && - (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0) - planes++; - - return planes; -} - static inline VkImageAspectFlags anv_plane_to_aspect(VkImageAspectFlags image_aspects, uint32_t plane) -- 2.7.4