diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-04-10 10:26:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-10 15:06:21 +0000 |
| commit | 2fbbd035302393cc92df8b2a08575dcfc6bdd375 (patch) | |
| tree | 6f7c0f4d02ae4f8ac109ebf55ca417cd43a781e6 | |
| parent | ded7a5586a3f6a1dd1cb1208878fd60af6cd989e (diff) | |
Remove extra Vulkan submitCommandBuffer from deleteTestingOnlyBackendTexture
Change-Id: I6e2fd012d1c2af72a34be2d1971e210d7373fe21
Reviewed-on: https://skia-review.googlesource.com/120080
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 2 | ||||
| -rw-r--r-- | tests/SurfaceTest.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 855232badd..0d45ae02ad 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -1543,8 +1543,6 @@ void GrVkGpu::deleteTestingOnlyBackendTexture(const GrBackendTexture& tex) { GrVkImageInfo info; if (tex.getVkImageInfo(&info)) { - // something in the command buffer may still be using this, so force submit - this->submitCommandBuffer(kForce_SyncQueue); GrVkImage::DestroyImageInfo(this, const_cast<GrVkImageInfo*>(&info)); } } diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index aa23998181..f2e0083a06 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -1033,6 +1033,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceCreationWithColorSpace_Gpu, reporter, context->flush(); GrGpu* gpu = context->contextPriv().getGpu(); + gpu->testingOnly_flushGpuAndSync(); for (auto backendTex : backendTextures) { gpu->deleteTestingOnlyBackendTexture(backendTex); } |