From a8e40de7a266dc82f60684c262b2b3234a37a510 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 26 Oct 2017 10:24:16 -0400 Subject: workaround for VkWrapTests crash Bug: skia: Change-Id: I60abda0bcbfbe9f8918f4a8d0a714c0e877e7cad Reviewed-on: https://skia-review.googlesource.com/64062 Reviewed-by: Greg Daniel Commit-Queue: Ethan Nicholas --- src/gpu/vk/GrVkGpu.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 3b40f27480..198a00ed8e 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -1489,8 +1489,10 @@ GrBackendObject GrVkGpu::createTestingOnlyBackendTexture(void* srcData, int w, i SkASSERT(!err); // Clean up transfer resources - GrVkMemory::FreeBufferMemory(this, GrVkBuffer::kCopyRead_Type, bufferAlloc); - VK_CALL(DestroyBuffer(fDevice, buffer, nullptr)); + if (buffer != VK_NULL_HANDLE) { // workaround for an older NVidia driver crash + GrVkMemory::FreeBufferMemory(this, GrVkBuffer::kCopyRead_Type, bufferAlloc); + VK_CALL(DestroyBuffer(fDevice, buffer, nullptr)); + } VK_CALL(FreeCommandBuffers(fDevice, fCmdPool, 1, &cmdBuffer)); VK_CALL(DestroyFence(fDevice, fence, nullptr)); -- cgit v1.2.3