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

radv: promote VK_KHR_maintenance6 to core 1.4 API

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32432>
This commit is contained in:
Samuel Pitoiset 2024-12-02 10:46:31 +01:00 • committed by Marge Bot
parent 54cd43f93e
commit 5b9ebe331c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_buffer.c
View file

@ -149,7 +149,7 @@ radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindBuf
for (uint32_t i = 0; i < bindInfoCount; ++i) {
VK_FROM_HANDLE(radv_device_memory, mem, pBindInfos[i].memory);
VK_FROM_HANDLE(radv_buffer, buffer, pBindInfos[i].buffer);
VkBindMemoryStatusKHR *status = (void *)vk_find_struct_const(&pBindInfos[i], BIND_MEMORY_STATUS_KHR);
VkBindMemoryStatus *status = (void *)vk_find_struct_const(&pBindInfos[i], BIND_MEMORY_STATUS);
if (status)
*status->pResult = VK_SUCCESS;

9
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -7120,8 +7120,8 @@ radv_bind_descriptor_set(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoint
}
static void
radv_bind_descriptor_sets(struct radv_cmd_buffer *cmd_buffer,
const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo, VkPipelineBindPoint bind_point)
radv_bind_descriptor_sets(struct radv_cmd_buffer *cmd_buffer, const VkBindDescriptorSetsInfo *pBindDescriptorSetsInfo,
VkPipelineBindPoint bind_point)
{
VK_FROM_HANDLE(radv_pipeline_layout, layout, pBindDescriptorSetsInfo->layout);
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
@ -7166,8 +7166,7 @@ radv_bind_descriptor_sets(struct radv_cmd_buffer *cmd_buffer,
}
VKAPI_ATTR void VKAPI_CALL
radv_CmdBindDescriptorSets2KHR(VkCommandBuffer commandBuffer,
const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo)
radv_CmdBindDescriptorSets2(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo *pBindDescriptorSetsInfo)
{
VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
@ -7327,7 +7326,7 @@ radv_CmdPushDescriptorSetWithTemplate2KHR(
}
VKAPI_ATTR void VKAPI_CALL
radv_CmdPushConstants2KHR(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR *pPushConstantsInfo)
radv_CmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo *pPushConstantsInfo)
{
VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
memcpy(cmd_buffer->push_constants + pPushConstantsInfo->offset, pPushConstantsInfo->pValues,

2
src/amd/vulkan/radv_image.c
View file

@ -1736,7 +1736,7 @@ radv_BindImageMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindImag
for (uint32_t i = 0; i < bindInfoCount; ++i) {
VK_FROM_HANDLE(radv_device_memory, mem, pBindInfos[i].memory);
VK_FROM_HANDLE(radv_image, image, pBindInfos[i].image);
VkBindMemoryStatusKHR *status = (void *)vk_find_struct_const(&pBindInfos[i], BIND_MEMORY_STATUS_KHR);
VkBindMemoryStatus *status = (void *)vk_find_struct_const(&pBindInfos[i], BIND_MEMORY_STATUS);
if (status)
*status->pResult = VK_SUCCESS;