Mesa (main): vulkan,radv: Move vk_format_depth/stencil_only to common code
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 17 21:47:45 UTC 2021
Module: Mesa
Branch: main
Commit: 48e8efd00e7ac7a57e889e3fb9ad4f0c78369db0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48e8efd00e7ac7a57e889e3fb9ad4f0c78369db0
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri Jul 30 12:42:27 2021 -0500
vulkan,radv: Move vk_format_depth/stencil_only to common code
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12023>
---
src/amd/vulkan/vk_format.h | 23 -----------------------
src/vulkan/util/vk_format.h | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/amd/vulkan/vk_format.h b/src/amd/vulkan/vk_format.h
index 8f9d4cf5c90..fc6a1afd6fe 100644
--- a/src/amd/vulkan/vk_format.h
+++ b/src/amd/vulkan/vk_format.h
@@ -121,22 +121,6 @@ vk_format_is_subsampled(VkFormat 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
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
vk_format_get_component_bits(VkFormat format, enum util_format_colorspace colorspace,
unsigned component)
diff --git a/src/vulkan/util/vk_format.h b/src/vulkan/util/vk_format.h
index 813ec4c367c..5d5658e61b9 100644
--- a/src/vulkan/util/vk_format.h
+++ b/src/vulkan/util/vk_format.h
@@ -61,4 +61,27 @@ vk_format_has_stencil(VkFormat format)
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
More information about the mesa-commit
mailing list