From 48e8efd00e7ac7a57e889e3fb9ad4f0c78369db0 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 30 Jul 2021 12:42:27 -0500
Subject: [PATCH] vulkan,radv: Move vk_format_depth/stencil_only to common code

Reviewed-by: Bas Nieuwenhuizen <bas@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