diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrMipMappedTest.cpp | 11 | ||||
| -rw-r--r-- | tests/ImageTest.cpp | 10 |
2 files changed, 6 insertions, 15 deletions
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 1462648a78..484b7bfd4f 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -203,14 +203,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrBackendTextureImageMipMappedTest, reporter, } // Must make sure the uses of the backend texture have finished (we possibly have a - // queued up copy) before we delete the backend texture. Thus we use readPixels here - // just to force the synchronization. - sk_sp<GrSurfaceContext> surfContext = - context->contextPriv().makeWrappedSurfaceContext(genProxy); - - SkBitmap bitmap; - bitmap.allocPixels(imageInfo); - surfContext->readPixels(imageInfo, bitmap.getPixels(), 0, 0, 0, 0); + // queued up copy) before we delete the backend texture. + context->flush(); + gpu->testingOnly_flushGpuAndSync(); gpu->deleteTestingOnlyBackendTexture(&backendTex); } diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 619b52d6e2..49ab65b6a7 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -939,13 +939,9 @@ static void test_cross_context_image(skiatest::Reporter* reporter, const GrConte otherTestContext->makeCurrent(); canvas->flush(); - // This readPixels call is needed for Vulkan to make sure the ReleaseProc is called. - // Even though we flushed above, this does not guarantee the command buffer will finish - // which is when we call the ReleaseProc. The readPixels forces a CPU sync so we know - // that the command buffer has finished and we've called the ReleaseProc. - SkBitmap bitmap; - bitmap.allocPixels(info); - canvas->readPixels(bitmap, 0, 0); + // This is specifically here for vulkan to guarantee the command buffer will finish + // which is when we call the ReleaseProc. + otherCtx->contextPriv().getGpu()->testingOnly_flushGpuAndSync(); } // Case #6: Verify that only one context can be using the image at a time |