Module: Mesa Branch: main Commit: a0fab95bc00653538c1ca4595baf200c6f13382d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0fab95bc00653538c1ca4595baf200c6f13382d
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 lvp: 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/26494> --- src/gallium/frontends/lavapipe/lvp_device.c | 10 +++++----- src/gallium/frontends/lavapipe/lvp_image.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index da30cacc80b..4c291b5aeb9 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -2278,7 +2278,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroySampler( vk_sampler_destroy(&device->vk, pAllocator, &sampler->vk); } -VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlotEXT( +VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlot( VkDevice _device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, @@ -2289,7 +2289,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlotEXT( pPrivateDataSlot); } -VKAPI_ATTR void VKAPI_CALL lvp_DestroyPrivateDataSlotEXT( +VKAPI_ATTR void VKAPI_CALL lvp_DestroyPrivateDataSlot( VkDevice _device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator) @@ -2298,7 +2298,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroyPrivateDataSlotEXT( vk_private_data_slot_destroy(&device->vk, privateDataSlot, pAllocator); } -VKAPI_ATTR VkResult VKAPI_CALL lvp_SetPrivateDataEXT( +VKAPI_ATTR VkResult VKAPI_CALL lvp_SetPrivateData( VkDevice _device, VkObjectType objectType, uint64_t objectHandle, @@ -2311,7 +2311,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_SetPrivateDataEXT( data); } -VKAPI_ATTR void VKAPI_CALL lvp_GetPrivateDataEXT( +VKAPI_ATTR void VKAPI_CALL lvp_GetPrivateData( VkDevice _device, VkObjectType objectType, uint64_t objectHandle, @@ -2502,7 +2502,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_GetCalibratedTimestampsEXT( return VK_SUCCESS; } -VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceGroupPeerMemoryFeaturesKHR( +VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceGroupPeerMemoryFeatures( VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c index aa60524c382..1d4cf165f3b 100644 --- a/src/gallium/frontends/lavapipe/lvp_image.c +++ b/src/gallium/frontends/lavapipe/lvp_image.c @@ -424,11 +424,11 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetImageSubresourceLayout( pLayout->size = plane->size; } -VKAPI_ATTR void VKAPI_CALL lvp_GetImageSubresourceLayout2EXT( +VKAPI_ATTR void VKAPI_CALL lvp_GetImageSubresourceLayout2KHR( VkDevice _device, VkImage _image, - const VkImageSubresource2EXT* pSubresource, - VkSubresourceLayout2EXT* pLayout) + const VkImageSubresource2KHR* pSubresource, + VkSubresourceLayout2KHR* pLayout) { lvp_GetImageSubresourceLayout(_device, _image, &pSubresource->imageSubresource, &pLayout->subresourceLayout); VkSubresourceHostMemcpySizeEXT *size = vk_find_struct(pLayout, SUBRESOURCE_HOST_MEMCPY_SIZE_EXT); @@ -445,7 +445,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceImageSubresourceLayoutKHR( /* technically supposed to be able to do this without creating an image, but that's harder */ if (lvp_image_create(_device, pInfo->pCreateInfo, NULL, &image) != VK_SUCCESS) return; - lvp_GetImageSubresourceLayout2EXT(_device, image, pInfo->pSubresource, pLayout); + lvp_GetImageSubresourceLayout2KHR(_device, image, pInfo->pSubresource, pLayout); lvp_DestroyImage(_device, image, NULL); }
