diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp')
-rw-r--r-- | chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp index 1d0d606963c..60467ea9a94 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp @@ -140,13 +140,16 @@ angle::Result SemaphoreVk::wait(gl::Context *context, vk::CommandBuffer *commandBuffer; ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&commandBuffer)); + // Image should not be accessed while unowned. + ASSERT(!textureVk->getImage().hasStagedUpdates()); + // Queue ownership transfer and layout transition. image.acquireFromExternal(contextVk, VK_QUEUE_FAMILY_EXTERNAL, rendererQueueFamilyIndex, layout, commandBuffer); } } - contextVk->insertWaitSemaphore(&mSemaphore); + contextVk->addWaitSemaphore(mSemaphore.getHandle(), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT); return angle::Result::Continue; } |