KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan/wsi: Use a STACK_ARRAY for stage_flags 

This avoids the heap allocation in the common case.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4037>
This commit is contained in:
Jason Ekstrand 2022-05-19 20:09:52 -05:00 committed by Marge Bot
parent e60bb58de7
commit d211f4891a
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/vulkan/wsi/wsi_common.c
View File

@ -939,6 +939,11 @@ wsi_common_queue_present(const struct wsi_device *wsi,
{
VkResult final_result = VK_SUCCESS;
STACK_ARRAY(VkPipelineStageFlags, stage_flags,
pPresentInfo->waitSemaphoreCount);
for (uint32_t s = 0; s < pPresentInfo->waitSemaphoreCount; s++)
stage_flags[s] = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
const VkPresentRegionsKHR *regions =
vk_find_struct_const(pPresentInfo->pNext, PRESENT_REGIONS_KHR);
@ -993,27 +998,12 @@ wsi_common_queue_present(const struct wsi_device *wsi,
.pNext = &mem_signal,
};
VkPipelineStageFlags *stage_flags = NULL;
if (i == 0) {
/* We only need/want to wait on semaphores once. After that, we're
* guaranteed ordering since it all happens on the same queue.
*/
submit_info.waitSemaphoreCount = pPresentInfo->waitSemaphoreCount;
submit_info.pWaitSemaphores = pPresentInfo->pWaitSemaphores;
/* Set up the pWaitDstStageMasks */
stage_flags = vk_alloc(&swapchain->alloc,
sizeof(VkPipelineStageFlags) *
pPresentInfo->waitSemaphoreCount,
8,
VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
if (!stage_flags) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto fail_present;
}
for (uint32_t s = 0; s < pPresentInfo->waitSemaphoreCount; s++)
stage_flags[s] = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
submit_info.pWaitDstStageMask = stage_flags;
}
@ -1042,7 +1032,6 @@ wsi_common_queue_present(const struct wsi_device *wsi,
}
result = wsi->QueueSubmit(queue, 1, &submit_info, fence);
vk_free(&swapchain->alloc, stage_flags);
if (result != VK_SUCCESS)
goto fail_present;
@ -1090,6 +1079,8 @@ wsi_common_queue_present(const struct wsi_device *wsi,
final_result = result;
}
STACK_ARRAY_FINISH(stage_flags);
return final_result;
}