diff options
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 5 | ||||
| -rw-r--r-- | tests/GrMipMappedTest.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 481232ebda..800751053a 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -1918,11 +1918,6 @@ bool GrVkGpu::onCopySurface(GrSurface* dst, GrSurfaceOrigin dstOrigin, srcImage = static_cast<GrVkTexture*>(src->asTexture()); } - // For borrowed textures, we *only* want to copy using draws (to avoid layout changes) - if (srcImage->isBorrowed()) { - return false; - } - if (can_copy_image(dst, dstOrigin, src, srcOrigin, this)) { this->copySurfaceAsCopyImage(dst, dstOrigin, src, srcOrigin, dstImage, srcImage, srcRect, dstPoint); diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index aaca9b4410..95604fa5a3 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -284,6 +284,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn // Must flush the context to make sure all the cmds (copies, etc.) from above are sent // to the gpu before we delete the backendHandle. context->flush(); + gpu->testingOnly_flushGpuAndSync(); gpu->deleteTestingOnlyBackendTexture(backendTex); } } |