From 24af06ac3ea279231df5e6caeeda27988df2a982 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 13 Jul 2021 17:45:49 +0100 Subject: [PATCH] Fix validation warnings in VK_Synchronization_2 test --- util/test/demos/vk/vk_sync2.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/util/test/demos/vk/vk_sync2.cpp b/util/test/demos/vk/vk_sync2.cpp index d79a99f49..06be6a908 100644 --- a/util/test/demos/vk/vk_sync2.cpp +++ b/util/test/demos/vk/vk_sync2.cpp @@ -171,16 +171,6 @@ RD_TEST(VK_Synchronization_2, VulkanGraphicsTest) setMarker(cmd, "Before Transition"); - // after the first N frames, we expect the swapchain to be in PRESENT_SRC - vkh::cmdPipelineBarrier(cmd, - { - vkh::ImageMemoryBarrier(0, VK_ACCESS_TRANSFER_WRITE_BIT, - (size_t)curFrame <= mainWindow->GetCount() - ? VK_IMAGE_LAYOUT_UNDEFINED - : VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, - VK_IMAGE_LAYOUT_GENERAL, swapimg), - }); - VkDependencyInfoKHR dependency = {VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR}; VkBufferMemoryBarrier2KHR bufBarrier = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR}; @@ -253,12 +243,12 @@ RD_TEST(VK_Synchronization_2, VulkanGraphicsTest) vkCmdResetEvent2KHR(cmd, ev, VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR); - vkCmdSetEvent2KHR(cmd, ev, &dependency); - vkCmdClearColorImage(cmd, swapimg, VK_IMAGE_LAYOUT_GENERAL, vkh::ClearColorValue(0.2f, 0.2f, 0.2f, 1.0f), 1, vkh::ImageSubresourceRange()); + vkCmdSetEvent2KHR(cmd, ev, &dependency); + VkImageCopy region = { {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}, {0, 0, 0},