From 8a61f311605c0c1f6d94fa58eea833128ae9bb50 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 30 Jan 2021 22:22:16 +0100 Subject: [PATCH] radv: Remove vk_format_has_stencil/depth helpers. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_image.c | 4 ++-- src/amd/vulkan/radv_pass.c | 2 +- src/amd/vulkan/vk_format.h | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 340882baa37..e1410d9143c 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -445,8 +445,8 @@ radv_get_surface_flags(struct radv_device *device, const struct util_format_description *desc = vk_format_description(format); bool is_depth, is_stencil; - is_depth = vk_format_has_depth(desc); - is_stencil = vk_format_has_stencil(desc); + is_depth = util_format_has_depth(desc); + is_stencil = util_format_has_stencil(desc); flags = RADEON_SURF_SET(array_mode, MODE); diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index adea6d6a465..b9de5d8285e 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -545,7 +545,7 @@ static VkImageLayout stencil_desc_layout(const VkAttachmentDescription2KHR *att_desc, bool final) { const struct util_format_description *desc = vk_format_description(att_desc->format); - if (!vk_format_has_stencil(desc)) + if (!util_format_has_stencil(desc)) return VK_IMAGE_LAYOUT_UNDEFINED; const VkImageLayout main_layout = diff --git a/src/amd/vulkan/vk_format.h b/src/amd/vulkan/vk_format.h index 88f596964e7..54fa790e6f0 100644 --- a/src/amd/vulkan/vk_format.h +++ b/src/amd/vulkan/vk_format.h @@ -144,20 +144,6 @@ vk_format_is_subsampled(VkFormat format) return util_format_is_subsampled_422(vk_format_to_pipe_format(format)); } -static inline bool -vk_format_has_depth(const struct util_format_description *desc) -{ - return desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS && - desc->swizzle[0] != PIPE_SWIZZLE_NONE; -} - -static inline bool -vk_format_has_stencil(const struct util_format_description *desc) -{ - return desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS && - desc->swizzle[1] != PIPE_SWIZZLE_NONE; -} - static inline bool vk_format_is_depth_or_stencil(VkFormat format) {