From a97966b840f728d6894d75ea3924b7108d9fa1f6 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Fri, 23 Feb 2024 09:51:14 -0400
Subject: [PATCH] vulkan: add vk_index_type_to_restart helper

from nvk

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27764>
---
 src/nouveau/vulkan/nvk_cmd_draw.c | 15 ---------------
 src/vulkan/util/vk_util.h         | 11 +++++++++++
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 5f7c96ae9c2..fa33faa8f5c 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -2076,21 +2076,6 @@ vk_to_nv_index_format(VkIndexType type)
    }
 }
 
-static uint32_t
-vk_index_to_restart(VkIndexType index_type)
-{
-   switch (index_type) {
-   case VK_INDEX_TYPE_UINT16:
-      return 0xffff;
-   case VK_INDEX_TYPE_UINT32:
-      return 0xffffffff;
-   case VK_INDEX_TYPE_UINT8_KHR:
-      return 0xff;
-   default:
-      unreachable("unexpected index type");
-   }
-}
-
 VKAPI_ATTR void VKAPI_CALL
 nvk_CmdBindIndexBuffer2KHR(VkCommandBuffer commandBuffer,
                            VkBuffer _buffer,
diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h
index 3329a7d4e9f..e1aef150c72 100644
--- a/src/vulkan/util/vk_util.h
+++ b/src/vulkan/util/vk_util.h
@@ -384,6 +384,17 @@ vk_index_type_to_bytes(enum VkIndexType type)
    }
 }
 
+static inline uint32_t
+vk_index_to_restart(enum VkIndexType type)
+{
+   switch (type) {
+   case VK_INDEX_TYPE_UINT8_KHR: return 0xff;
+   case VK_INDEX_TYPE_UINT16:    return 0xffff;
+   case VK_INDEX_TYPE_UINT32:    return 0xffffffff;
+   default:                      unreachable("unexpected index type");
+   }
+}
+
 #ifdef __cplusplus
 }
 #endif