From 976d5b95515b6339f5c52c9f84d263f9dae8399a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 25 Jan 2024 16:37:23 +0200 Subject: [PATCH] anv: promote EXT_index_type_uint8 to KHR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/anv_device.c | 1 + src/intel/vulkan/genX_acceleration_structure.c | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 58d4b83c4d2..dfa908c2117 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -253,6 +253,7 @@ get_device_extensions(const struct anv_physical_device *device, #ifdef ANV_USE_WSI_PLATFORM .KHR_incremental_present = true, #endif + .KHR_index_type_uint8 = true, .KHR_maintenance1 = true, .KHR_maintenance2 = true, .KHR_maintenance3 = true, diff --git a/src/intel/vulkan/genX_acceleration_structure.c b/src/intel/vulkan/genX_acceleration_structure.c index 32fbb32bc66..31859c3e9e4 100644 --- a/src/intel/vulkan/genX_acceleration_structure.c +++ b/src/intel/vulkan/genX_acceleration_structure.c @@ -437,7 +437,7 @@ vk_to_grl_IndexFormat(VkIndexType type) { switch (type) { case VK_INDEX_TYPE_NONE_KHR: return INDEX_FORMAT_NONE; - case VK_INDEX_TYPE_UINT8_EXT: unreachable("No UINT8 support yet"); + case VK_INDEX_TYPE_UINT8_KHR: unreachable("No UINT8 support yet"); case VK_INDEX_TYPE_UINT16: return INDEX_FORMAT_R16_UINT; case VK_INDEX_TYPE_UINT32: return INDEX_FORMAT_R32_UINT; default: diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 5145512ea5f..7395046ec58 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -5193,7 +5193,7 @@ void genX(CmdWaitEvents2)( static uint32_t vk_to_intel_index_type(VkIndexType type) { switch (type) { - case VK_INDEX_TYPE_UINT8_EXT: + case VK_INDEX_TYPE_UINT8_KHR: return INDEX_BYTE; case VK_INDEX_TYPE_UINT16: return INDEX_WORD; @@ -5207,7 +5207,7 @@ static uint32_t vk_to_intel_index_type(VkIndexType type) static uint32_t restart_index_for_type(VkIndexType type) { switch (type) { - case VK_INDEX_TYPE_UINT8_EXT: + case VK_INDEX_TYPE_UINT8_KHR: return UINT8_MAX; case VK_INDEX_TYPE_UINT16: return UINT16_MAX;