Module: Mesa Branch: main Commit: 84c27ea42c17433983740f52ec65199349e36219 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=84c27ea42c17433983740f52ec65199349e36219
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 vk/runtime: update symbols that have become aliases for newer ones All of these have been renamed in the spec (usually by being promoted); renamed them in our code too. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26487> --- src/vulkan/runtime/vk_acceleration_structure.c | 2 +- src/vulkan/runtime/vk_cmd_copy.c | 12 ++++----- src/vulkan/runtime/vk_device_memory.c | 2 +- src/vulkan/runtime/vk_graphics_state.c | 8 +++--- src/vulkan/runtime/vk_object.c | 36 +++++++++++++------------- src/vulkan/runtime/vk_queue.c | 2 +- src/vulkan/runtime/vk_synchronization.c | 28 ++++++++++---------- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/vulkan/runtime/vk_acceleration_structure.c b/src/vulkan/runtime/vk_acceleration_structure.c index 077e3669f4c..074b94ea85c 100644 --- a/src/vulkan/runtime/vk_acceleration_structure.c +++ b/src/vulkan/runtime/vk_acceleration_structure.c @@ -65,7 +65,7 @@ vk_common_CreateAccelerationStructureKHR(VkDevice _device, if (pCreateInfo->deviceAddress && vk_acceleration_structure_get_va(accel_struct) != pCreateInfo->deviceAddress) - return vk_error(device, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR); + return vk_error(device, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS); *pAccelerationStructure = vk_acceleration_structure_to_handle(accel_struct); return VK_SUCCESS; diff --git a/src/vulkan/runtime/vk_cmd_copy.c b/src/vulkan/runtime/vk_cmd_copy.c index 5e9df8171ed..5b4ef8a28d2 100644 --- a/src/vulkan/runtime/vk_cmd_copy.c +++ b/src/vulkan/runtime/vk_cmd_copy.c @@ -56,7 +56,7 @@ vk_common_CmdCopyBuffer(VkCommandBuffer commandBuffer, .pRegions = region2s, }; - disp->device->dispatch_table.CmdCopyBuffer2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdCopyBuffer2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } @@ -98,7 +98,7 @@ vk_common_CmdCopyImage(VkCommandBuffer commandBuffer, .pRegions = region2s, }; - disp->device->dispatch_table.CmdCopyImage2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdCopyImage2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } @@ -139,7 +139,7 @@ vk_common_CmdCopyBufferToImage(VkCommandBuffer commandBuffer, .pRegions = region2s, }; - disp->device->dispatch_table.CmdCopyBufferToImage2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdCopyBufferToImage2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } @@ -180,7 +180,7 @@ vk_common_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, .pRegions = region2s, }; - disp->device->dispatch_table.CmdCopyImageToBuffer2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdCopyImageToBuffer2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } @@ -229,7 +229,7 @@ vk_common_CmdBlitImage(VkCommandBuffer commandBuffer, .filter = filter, }; - disp->device->dispatch_table.CmdBlitImage2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdBlitImage2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } @@ -271,7 +271,7 @@ vk_common_CmdResolveImage(VkCommandBuffer commandBuffer, .pRegions = region2s, }; - disp->device->dispatch_table.CmdResolveImage2KHR(commandBuffer, &info); + disp->device->dispatch_table.CmdResolveImage2(commandBuffer, &info); STACK_ARRAY_FINISH(region2s); } diff --git a/src/vulkan/runtime/vk_device_memory.c b/src/vulkan/runtime/vk_device_memory.c index d40e8828d2e..56a1b5ff1cc 100644 --- a/src/vulkan/runtime/vk_device_memory.c +++ b/src/vulkan/runtime/vk_device_memory.c @@ -215,6 +215,6 @@ vk_common_GetMemoryAndroidHardwareBufferANDROID( return VK_SUCCESS; } - return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR; + return VK_ERROR_INVALID_EXTERNAL_HANDLE; } #endif diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c index eb6f22a9b6f..407fabe3ad8 100644 --- a/src/vulkan/runtime/vk_graphics_state.c +++ b/src/vulkan/runtime/vk_graphics_state.c @@ -1408,10 +1408,10 @@ vk_graphics_pipeline_state_fill(const struct vk_device *device, * * "If the pipeline is being created with pre-rasterization shader * state the stage member of one element of pStages must be either - * VK_SHADER_STAGE_VERTEX_BIT or VK_SHADER_STAGE_MESH_BIT_NV" + * VK_SHADER_STAGE_VERTEX_BIT or VK_SHADER_STAGE_MESH_BIT_EXT" */ assert(state->shader_stages & (VK_SHADER_STAGE_VERTEX_BIT | - VK_SHADER_STAGE_MESH_BIT_NV)); + VK_SHADER_STAGE_MESH_BIT_EXT)); if (state->shader_stages & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT)) @@ -2306,8 +2306,8 @@ vk_common_CmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, } VKAPI_ATTR void VKAPI_CALL -vk_common_CmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 rasterizerDiscardEnable) +vk_common_CmdSetRasterizerDiscardEnable(VkCommandBuffer commandBuffer, + VkBool32 rasterizerDiscardEnable) { VK_FROM_HANDLE(vk_command_buffer, cmd, commandBuffer); struct vk_dynamic_graphics_state *dyn = &cmd->dynamic_graphics_state; diff --git a/src/vulkan/runtime/vk_object.c b/src/vulkan/runtime/vk_object.c index 753640b77b8..10ce9f4e5c1 100644 --- a/src/vulkan/runtime/vk_object.c +++ b/src/vulkan/runtime/vk_object.c @@ -240,7 +240,7 @@ vk_object_base_private_data(struct vk_device *device, * VK_EXT_private_data extension, we have to handle VkSwapchainKHR in the * driver as a special case. On future versions of Android where the * loader does understand VK_EXT_private_data, we'll never see a - * vkGet/SetPrivateDataEXT call on a swapchain because the loader will + * vkGet/SetPrivateData call on a swapchain because the loader will * handle it. */ #ifdef ANDROID @@ -302,10 +302,10 @@ vk_object_base_get_private_data(struct vk_device *device, } VKAPI_ATTR VkResult VKAPI_CALL -vk_common_CreatePrivateDataSlotEXT(VkDevice _device, - const VkPrivateDataSlotCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPrivateDataSlot *pPrivateDataSlot) +vk_common_CreatePrivateDataSlot(VkDevice _device, + const VkPrivateDataSlotCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPrivateDataSlot *pPrivateDataSlot) { VK_FROM_HANDLE(vk_device, device, _device); return vk_private_data_slot_create(device, pCreateInfo, pAllocator, @@ -313,20 +313,20 @@ vk_common_CreatePrivateDataSlotEXT(VkDevice _device, } VKAPI_ATTR void VKAPI_CALL -vk_common_DestroyPrivateDataSlotEXT(VkDevice _device, - VkPrivateDataSlot privateDataSlot, - const VkAllocationCallbacks *pAllocator) +vk_common_DestroyPrivateDataSlot(VkDevice _device, + VkPrivateDataSlot privateDataSlot, + const VkAllocationCallbacks *pAllocator) { VK_FROM_HANDLE(vk_device, device, _device); vk_private_data_slot_destroy(device, privateDataSlot, pAllocator); } VKAPI_ATTR VkResult VKAPI_CALL -vk_common_SetPrivateDataEXT(VkDevice _device, - VkObjectType objectType, - uint64_t objectHandle, - VkPrivateDataSlot privateDataSlot, - uint64_t data) +vk_common_SetPrivateData(VkDevice _device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t data) { VK_FROM_HANDLE(vk_device, device, _device); return vk_object_base_set_private_data(device, @@ -335,11 +335,11 @@ vk_common_SetPrivateDataEXT(VkDevice _device, } VKAPI_ATTR void VKAPI_CALL -vk_common_GetPrivateDataEXT(VkDevice _device, - VkObjectType objectType, - uint64_t objectHandle, - VkPrivateDataSlot privateDataSlot, - uint64_t *pData) +vk_common_GetPrivateData(VkDevice _device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t *pData) { VK_FROM_HANDLE(vk_device, device, _device); vk_object_base_get_private_data(device, diff --git a/src/vulkan/runtime/vk_queue.c b/src/vulkan/runtime/vk_queue.c index 9e38299ed05..81087dde7fc 100644 --- a/src/vulkan/runtime/vk_queue.c +++ b/src/vulkan/runtime/vk_queue.c @@ -1142,7 +1142,7 @@ vk_queue_finish(struct vk_queue *queue) } VKAPI_ATTR VkResult VKAPI_CALL -vk_common_QueueSubmit2KHR(VkQueue _queue, +vk_common_QueueSubmit2(VkQueue _queue, uint32_t submitCount, const VkSubmitInfo2 *pSubmits, VkFence _fence) diff --git a/src/vulkan/runtime/vk_synchronization.c b/src/vulkan/runtime/vk_synchronization.c index 36873bb9062..53fb56e686d 100644 --- a/src/vulkan/runtime/vk_synchronization.c +++ b/src/vulkan/runtime/vk_synchronization.c @@ -77,10 +77,10 @@ vk_common_CmdWriteTimestamp( VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer); struct vk_device *device = cmd_buffer->base.device; - device->dispatch_table.CmdWriteTimestamp2KHR(commandBuffer, - (VkPipelineStageFlags2) pipelineStage, - queryPool, - query); + device->dispatch_table.CmdWriteTimestamp2(commandBuffer, + (VkPipelineStageFlags2) pipelineStage, + queryPool, + query); } static VkMemoryBarrier2 @@ -188,7 +188,7 @@ vk_common_CmdPipelineBarrier( .pImageMemoryBarriers = image_barriers, }; - device->dispatch_table.CmdPipelineBarrier2KHR(commandBuffer, &dep_info); + device->dispatch_table.CmdPipelineBarrier2(commandBuffer, &dep_info); STACK_ARRAY_FINISH(memory_barriers); STACK_ARRAY_FINISH(buffer_barriers); @@ -215,7 +215,7 @@ vk_common_CmdSetEvent( .pMemoryBarriers = &mem_barrier, }; - device->dispatch_table.CmdSetEvent2KHR(commandBuffer, event, &dep_info); + device->dispatch_table.CmdSetEvent2(commandBuffer, event, &dep_info); } VKAPI_ATTR void VKAPI_CALL @@ -227,9 +227,9 @@ vk_common_CmdResetEvent( VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer); struct vk_device *device = cmd_buffer->base.device; - device->dispatch_table.CmdResetEvent2KHR(commandBuffer, - event, - (VkPipelineStageFlags2) stageMask); + device->dispatch_table.CmdResetEvent2(commandBuffer, + event, + (VkPipelineStageFlags2) stageMask); } VKAPI_ATTR void VKAPI_CALL @@ -269,7 +269,7 @@ vk_common_CmdWaitEvents( .pMemoryBarriers = &stage_barrier, }; } - device->dispatch_table.CmdWaitEvents2KHR(commandBuffer, eventCount, pEvents, deps); + device->dispatch_table.CmdWaitEvents2(commandBuffer, eventCount, pEvents, deps); STACK_ARRAY_FINISH(deps); @@ -454,10 +454,10 @@ vk_common_QueueSubmit( n_signal_semaphores += pSubmits[s].signalSemaphoreCount; } - VkResult result = device->dispatch_table.QueueSubmit2KHR(_queue, - submitCount, - submit_info_2, - fence); + VkResult result = device->dispatch_table.QueueSubmit2(_queue, + submitCount, + submit_info_2, + fence); STACK_ARRAY_FINISH(wait_semaphores); STACK_ARRAY_FINISH(command_buffers);
