OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/overlay: bounce image back to present layout

Browse Source 
Once we write the overlay to an image to be presented, we must not
forget to put it back into present layout.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111401
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Lionel Landwerlin
2019-08-21 13:47:25 +02:00
parent 9db06a5350
commit 320b0f66c2
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/vulkan/overlay-layer/overlay.cpp
View File

@@ -912,6 +912,7 @@ static void CreateOrResizeBuffer(struct device_data *data,
} }
static struct overlay_draw *render_swapchain_display(struct swapchain_data *data, static struct overlay_draw *render_swapchain_display(struct swapchain_data *data,
struct queue_data *present_queue,
const VkSemaphore *wait_semaphores, const VkSemaphore *wait_semaphores,
unsigned n_wait_semaphores, unsigned n_wait_semaphores,
unsigned image_index) unsigned image_index)
@@ -955,7 +956,7 @@ static struct overlay_draw *render_swapchain_display(struct swapchain_data *data
imb.subresourceRange.levelCount = 1; imb.subresourceRange.levelCount = 1;
imb.subresourceRange.baseArrayLayer = 0; imb.subresourceRange.baseArrayLayer = 0;
imb.subresourceRange.layerCount = 1; imb.subresourceRange.layerCount = 1;
imb.srcQueueFamilyIndex = device_data->graphic_queue->family_index; imb.srcQueueFamilyIndex = present_queue->family_index;
imb.dstQueueFamilyIndex = device_data->graphic_queue->family_index; imb.dstQueueFamilyIndex = device_data->graphic_queue->family_index;
device_data->vtable.CmdPipelineBarrier(draw->command_buffer, device_data->vtable.CmdPipelineBarrier(draw->command_buffer,
VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
@@ -1082,6 +1083,30 @@ static struct overlay_draw *render_swapchain_display(struct swapchain_data *data
} }
device_data->vtable.CmdEndRenderPass(draw->command_buffer); device_data->vtable.CmdEndRenderPass(draw->command_buffer);
/* Bounce the image to display back to present layout. */
imb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
imb.pNext = nullptr;
imb.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
imb.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
imb.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
imb.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
imb.image = data->images[image_index];
imb.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
imb.subresourceRange.baseMipLevel = 0;
imb.subresourceRange.levelCount = 1;
imb.subresourceRange.baseArrayLayer = 0;
imb.subresourceRange.layerCount = 1;
imb.srcQueueFamilyIndex = device_data->graphic_queue->family_index;
imb.dstQueueFamilyIndex = present_queue->family_index;
device_data->vtable.CmdPipelineBarrier(draw->command_buffer,
VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
0, /* dependency flags */
0, nullptr, /* memory barriers */
0, nullptr, /* buffer memory barriers */
1, &imb); /* image memory barriers */
device_data->vtable.EndCommandBuffer(draw->command_buffer); device_data->vtable.EndCommandBuffer(draw->command_buffer);
VkSubmitInfo submit_info = {}; VkSubmitInfo submit_info = {};
@@ -1514,6 +1539,7 @@ static void shutdown_swapchain_data(struct swapchain_data *data)
} }
static struct overlay_draw *before_present(struct swapchain_data *swapchain_data, static struct overlay_draw *before_present(struct swapchain_data *swapchain_data,
struct queue_data *present_queue,
const VkSemaphore *wait_semaphores, const VkSemaphore *wait_semaphores,
unsigned n_wait_semaphores, unsigned n_wait_semaphores,
unsigned imageIndex) unsigned imageIndex)
@@ -1525,7 +1551,7 @@ static struct overlay_draw *before_present(struct swapchain_data *swapchain_data
if (!instance_data->params.no_display && swapchain_data->n_frames > 0) { if (!instance_data->params.no_display && swapchain_data->n_frames > 0) {
compute_swapchain_display(swapchain_data); compute_swapchain_display(swapchain_data);
draw = render_swapchain_display(swapchain_data, draw = render_swapchain_display(swapchain_data, present_queue,
wait_semaphores, n_wait_semaphores, wait_semaphores, n_wait_semaphores,
imageIndex); imageIndex);
} }
@@ -1630,6 +1656,7 @@ static VkResult overlay_QueuePresentKHR(
FIND(struct swapchain_data, swapchain); FIND(struct swapchain_data, swapchain);
before_present(swapchain_data, before_present(swapchain_data,
queue_data,
pPresentInfo->pWaitSemaphores, pPresentInfo->pWaitSemaphores,
pPresentInfo->waitSemaphoreCount, pPresentInfo->waitSemaphoreCount,
pPresentInfo->pImageIndices[i]); pPresentInfo->pImageIndices[i]);
@@ -1655,6 +1682,7 @@ static VkResult overlay_QueuePresentKHR(
uint32_t image_index = pPresentInfo->pImageIndices[i]; uint32_t image_index = pPresentInfo->pImageIndices[i];
struct overlay_draw *draw = before_present(swapchain_data, struct overlay_draw *draw = before_present(swapchain_data,
queue_data,
pPresentInfo->pWaitSemaphores, pPresentInfo->pWaitSemaphores,
pPresentInfo->waitSemaphoreCount, pPresentInfo->waitSemaphoreCount,
image_index); image_index);