fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-12 13:20:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: cleanup zink_end_batch

Browse source 
This inlines submit_cmdbuf into zink_end_batch, the only place it's
used. This makes the code a bit more straight-forward to read.

Acked-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Erik Faye-Lund 2019-07-10 12:40:01 +02:00
parent 8edd357795
commit 03efb6dd27
1 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/gallium/drivers/zink/zink_batch.c
View file

@ -60,29 +60,6 @@ zink_start_batch(struct zink_context *ctx, struct zink_batch *batch)
debug_printf("vkBeginCommandBuffer failed\n");
}
static bool
submit_cmdbuf(struct zink_context *ctx, VkCommandBuffer cmdbuf, VkFence fence)
{
VkPipelineStageFlags wait = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
VkSubmitInfo si = {};
si.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
si.waitSemaphoreCount = 0;
si.pWaitSemaphores = NULL;
si.signalSemaphoreCount = 0;
si.pSignalSemaphores = NULL;
si.pWaitDstStageMask = &wait;
si.commandBufferCount = 1;
si.pCommandBuffers = &cmdbuf;
if (vkQueueSubmit(ctx->queue, 1, &si, fence) != VK_SUCCESS) {
debug_printf("vkQueueSubmit failed\n");
return false;
}
return true;
}
void
zink_end_batch(struct zink_context *ctx, struct zink_batch *batch)
{
@ -93,9 +70,23 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch)
assert(batch->fence == NULL);
batch->fence = zink_create_fence(ctx->base.screen);
if (!batch->fence ||
!submit_cmdbuf(ctx, batch->cmdbuf, batch->fence->fence))
if (!batch->fence)
return;
VkPipelineStageFlags wait = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
VkSubmitInfo si = {};
si.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
si.waitSemaphoreCount = 0;
si.pWaitSemaphores = NULL;
si.signalSemaphoreCount = 0;
si.pSignalSemaphores = NULL;
si.pWaitDstStageMask = &wait;
si.commandBufferCount = 1;
si.pCommandBuffers = &batch->cmdbuf;
if (vkQueueSubmit(ctx->queue, 1, &si, batch->fence->fence) != VK_SUCCESS)
debug_printf("vkQueueSubmit failed\n");
}
void