Vulkan: Relax ASSERT in SemaphoreVk::wait()

The assert in SemaphoreVk::wait() was verifying that acquired images don't have any staged updates. That assert was failing for images with emulated image formats, which may have staged updates to clear the image after initialization. Bug: chromium:1096746 Change-Id: I74658a8ae48e6c09aa4a859ceb1e2a7099e021c0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2427551Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Michael Spang <spang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Vulkan: Relax ASSERT in SemaphoreVk::wait()
483473ae · Sergey Ulanov · Commit Bot · e78d9a61 · 483473ae
Commit 483473ae authored Sep 23, 2020 by Sergey Ulanov Committed by Commit Bot Sep 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

SemaphoreVk.cpp src/libANGLE/renderer/vulkan/SemaphoreVk.cpp +3 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
@@ -138,8 +138,9 @@ angle::Result SemaphoreVk::wait(gl::Context *context,
            vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer();
-            // Image should not be accessed while unowned.
+            // Image should not be accessed while unowned. Emulated formats may have staged updates
-            ASSERT(!textureVk->getImage().hasStagedUpdates());
+            // to clear the image after initialization.
+            ASSERT(!image.hasStagedUpdates() || image.getFormat().hasEmulatedImageChannels());
            // Queue ownership transfer and layout transition.
            image.acquireFromExternal(contextVk, VK_QUEUE_FAMILY_EXTERNAL, rendererQueueFamilyIndex,