Fix Vulkan command buffer assert on device lost
BUG=skia:5939
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4483
Change-Id: Id363c4d774095b1707adbe6c8ab537c6e5ecab6c
Reviewed-on: https://skia-review.googlesource.com/4483
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index f11193f..b64d3ce 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -166,12 +166,12 @@
// wait for all commands to finish
fResourceProvider.checkCommandBuffers();
- SkDEBUGCODE(VkResult res = ) VK_CALL(QueueWaitIdle(fQueue));
+ VkResult res = VK_CALL(QueueWaitIdle(fQueue));
// On windows, sometimes calls to QueueWaitIdle return before actually signalling the fences
// on the command buffers even though they have completed. This causes an assert to fire when
// destroying the command buffers. Currently this ony seems to happen on windows, so we add a
- // sleep to make sure the fence singals.
+ // sleep to make sure the fence signals.
#ifdef SK_DEBUG
#if defined(SK_BUILD_FOR_WIN)
Sleep(10); // In milliseconds
@@ -187,8 +187,8 @@
fCopyManager.destroyResources(this);
- // must call this just before we destroy the VkDevice
- fResourceProvider.destroyResources();
+ // must call this just before we destroy the command pool and VkDevice
+ fResourceProvider.destroyResources(VK_ERROR_DEVICE_LOST == res);
VK_CALL(DestroyCommandPool(fDevice, fCmdPool, nullptr));