fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/runtime: update symbols that have become aliases for newer ones

Browse source 
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>
This commit is contained in:
Eric Engestrom 2023-12-03 19:41:49 +00:00 • committed by Marge Bot
parent 7c76125db2
commit 84c27ea42c
7 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vulkan/runtime/vk_acceleration_structure.c
View file

@ -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;

12
src/vulkan/runtime/vk_cmd_copy.c
View file

@ -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);
}

2
src/vulkan/runtime/vk_device_memory.c
View file

@ -215,6 +215,6 @@ vk_common_GetMemoryAndroidHardwareBufferANDROID(
return VK_SUCCESS;
}
return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR;
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
}
#endif

8
src/vulkan/runtime/vk_graphics_state.c
View file

@ -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;

36
src/vulkan/runtime/vk_object.c
View file

@ -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,

2
src/vulkan/runtime/vk_queue.c
View file

@ -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)

28
src/vulkan/runtime/vk_synchronization.c
View file

@ -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);