| commit | ddf9835e9cdf512b1d5172d014f00ceb6dacd039 | [log] [tgz] |
|---|---|---|
| author | jvanverth <jvanverth@google.com> | Mon Mar 21 11:46:00 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Mon Mar 21 11:46:00 2016 -0700 |
| tree | 8b48faa9fa99df0e87d71b80bddd3b8a48052535 | |
| parent | fa4c20e728c2b25f7b1a7d858adc8156005ec229 [diff] [blame] |
Minor fixes to avoid NVPR in Vulkan and provide good GrVkGpu teardown. BUG=skia:5097 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1818093002 Review URL: https://codereview.chromium.org/1818093002
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 96c74dd..0666f10 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp
@@ -356,9 +356,11 @@ fCurrentCmdBuffer->unref(this); // wait for all commands to finish + fResourceProvider.checkCommandBuffers(); VkResult res = VK_CALL(QueueWaitIdle(fQueue)); - SkASSERT(res == VK_SUCCESS); - + // VK_ERROR_DEVICE_LOST is acceptable when tearing down (see 4.2.4 in spec) + SkASSERT(VK_SUCCESS == res || VK_ERROR_DEVICE_LOST == res); + // must call this just before we destroy the VkDevice fResourceProvider.destroyResources();