OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan,radv: Move vk_format_depth/stencil_only to common code

Browse Source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12023>
This commit is contained in:
Jason Ekstrand
2021-07-30 12:42:27 -05:00
committed by Marge Bot
parent 7878d516c6
commit 48e8efd00e
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/amd/vulkan/vk_format.h
View File

@@ -121,22 +121,6 @@ vk_format_is_subsampled(VkFormat format)
return util_format_is_subsampled_422(vk_format_to_pipe_format(format)); return util_format_is_subsampled_422(vk_format_to_pipe_format(format));
} }
static inline VkFormat
vk_format_depth_only(VkFormat format)
{
assert(vk_format_has_depth(format));
switch (format) {
case VK_FORMAT_D16_UNORM_S8_UINT:
return VK_FORMAT_D16_UNORM;
case VK_FORMAT_D24_UNORM_S8_UINT:
return VK_FORMAT_X8_D24_UNORM_PACK32;
case VK_FORMAT_D32_SFLOAT_S8_UINT:
return VK_FORMAT_D32_SFLOAT;
default:
return format;
}
}
static inline bool static inline bool
vk_format_is_int(VkFormat format) vk_format_is_int(VkFormat format)
{ {
@@ -207,13 +191,6 @@ vk_format_no_srgb(VkFormat format)
} }
} }
static inline VkFormat
vk_format_stencil_only(VkFormat format)
{
assert(vk_format_has_stencil(format));
return VK_FORMAT_S8_UINT;
}
static inline unsigned static inline unsigned
vk_format_get_component_bits(VkFormat format, enum util_format_colorspace colorspace, vk_format_get_component_bits(VkFormat format, enum util_format_colorspace colorspace,
unsigned component) unsigned component)

23
src/vulkan/util/vk_format.h
View File

@@ -61,4 +61,27 @@ vk_format_has_stencil(VkFormat format)
return aspects & VK_IMAGE_ASPECT_STENCIL_BIT; return aspects & VK_IMAGE_ASPECT_STENCIL_BIT;
} }
static inline VkFormat
vk_format_depth_only(VkFormat format)
{
assert(vk_format_has_depth(format));
switch (format) {
case VK_FORMAT_D16_UNORM_S8_UINT:
return VK_FORMAT_D16_UNORM;
case VK_FORMAT_D24_UNORM_S8_UINT:
return VK_FORMAT_X8_D24_UNORM_PACK32;
case VK_FORMAT_D32_SFLOAT_S8_UINT:
return VK_FORMAT_D32_SFLOAT;
default:
return format;
}
}
static inline VkFormat
vk_format_stencil_only(VkFormat format)
{
assert(vk_format_has_stencil(format));
return VK_FORMAT_S8_UINT;
}
#endif #endif