diff options
author | Mike Reed <reed@google.com> | 2016-12-29 09:36:20 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-29 16:01:42 +0000 |
commit | 85ff84821d5f6c8d48f2af12bdffdd3b5f8baf2c (patch) | |
tree | 73199a7a61951d83c961b0df24cfd72dc21bd7f4 /tests | |
parent | db90e26e2bb7f0bf767e04129673bd2fa48545a6 (diff) |
remove unused ForceUnique option from makeImageSnapshot
BUG=skia:
Change-Id: I2555ceb86b597f7bb34c8fc48b3e07eb7115ea82
Reviewed-on: https://skia-review.googlesource.com/6481
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/SurfaceTest.cpp | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index ec8e4a9059..1f04de5903 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -221,134 +221,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceBackendHandleAccessCopyOnWrite_Gpu, re } #endif -static bool same_image(SkImage* a, SkImage* b, - std::function<intptr_t(SkImage*)> getImageBackingStore) { - return getImageBackingStore(a) == getImageBackingStore(b); -} - -static bool same_image_surf(SkImage* a, SkSurface* b, - std::function<intptr_t(SkImage*)> getImageBackingStore, - std::function<intptr_t(SkSurface*)> getSurfaceBackingStore) { - return getImageBackingStore(a) == getSurfaceBackingStore(b); -} - -static void test_unique_image_snap(skiatest::Reporter* reporter, SkSurface* surface, - bool surfaceIsDirect, - std::function<intptr_t(SkImage*)> imageBackingStore, - std::function<intptr_t(SkSurface*)> surfaceBackingStore) { - std::function<intptr_t(SkImage*)> ibs = imageBackingStore; - std::function<intptr_t(SkSurface*)> sbs = surfaceBackingStore; - static const SkBudgeted kB = SkBudgeted::kNo; - { - sk_sp<SkImage> image(surface->makeImageSnapshot(kB, SkSurface::kYes_ForceUnique)); - REPORTER_ASSERT(reporter, !same_image_surf(image.get(), surface, ibs, sbs)); - REPORTER_ASSERT(reporter, image->unique()); - } - { - sk_sp<SkImage> image1(surface->makeImageSnapshot(kB, SkSurface::kYes_ForceUnique)); - REPORTER_ASSERT(reporter, !same_image_surf(image1.get(), surface, ibs, sbs)); - REPORTER_ASSERT(reporter, image1->unique()); - sk_sp<SkImage> image2(surface->makeImageSnapshot(kB, SkSurface::kYes_ForceUnique)); - REPORTER_ASSERT(reporter, !same_image_surf(image2.get(), surface, ibs, sbs)); - REPORTER_ASSERT(reporter, !same_image(image1.get(), image2.get(), ibs)); - REPORTER_ASSERT(reporter, image2->unique()); - } - { - sk_sp<SkImage> image1(surface->makeImageSnapshot(kB, SkSurface::kNo_ForceUnique)); - sk_sp<SkImage> image2(surface->makeImageSnapshot(kB, SkSurface::kYes_ForceUnique)); - sk_sp<SkImage> image3(surface->makeImageSnapshot(kB, SkSurface::kNo_ForceUnique)); - sk_sp<SkImage> image4(surface->makeImageSnapshot(kB, SkSurface::kYes_ForceUnique)); - // Image 1 and 3 ought to be the same (or we're missing an optimization). - REPORTER_ASSERT(reporter, same_image(image1.get(), image3.get(), ibs)); - // If the surface is not direct then images 1 and 3 should alias the surface's - // store. - REPORTER_ASSERT(reporter, !surfaceIsDirect == same_image_surf(image1.get(), surface, ibs, sbs)); - // Image 2 should not be shared with any other image. - REPORTER_ASSERT(reporter, !same_image(image1.get(), image2.get(), ibs) && - !same_image(image3.get(), image2.get(), ibs) && - !same_image(image4.get(), image2.get(), ibs)); - REPORTER_ASSERT(reporter, image2->unique()); - REPORTER_ASSERT(reporter, !same_image_surf(image2.get(), surface, ibs, sbs)); - // Image 4 should not be shared with any other image. - REPORTER_ASSERT(reporter, !same_image(image1.get(), image4.get(), ibs) && - !same_image(image3.get(), image4.get(), ibs)); - REPORTER_ASSERT(reporter, !same_image_surf(image4.get(), surface, ibs, sbs)); - REPORTER_ASSERT(reporter, image4->unique()); - } -} - -DEF_TEST(UniqueImageSnapshot, reporter) { - auto getImageBackingStore = [reporter](SkImage* image) { - SkPixmap pm; - bool success = image->peekPixels(&pm); - REPORTER_ASSERT(reporter, success); - return reinterpret_cast<intptr_t>(pm.addr()); - }; - auto getSufaceBackingStore = [reporter](SkSurface* surface) { - SkPixmap pmap; - const void* pixels = surface->getCanvas()->peekPixels(&pmap) ? pmap.addr() : nullptr; - REPORTER_ASSERT(reporter, pixels); - return reinterpret_cast<intptr_t>(pixels); - }; - - auto surface(create_surface()); - test_unique_image_snap(reporter, surface.get(), false, getImageBackingStore, - getSufaceBackingStore); - surface = create_direct_surface(); - test_unique_image_snap(reporter, surface.get(), true, getImageBackingStore, - getSufaceBackingStore); -} - -#if SK_SUPPORT_GPU -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(UniqueImageSnapshot_Gpu, reporter, ctxInfo) { - GrContext* context = ctxInfo.grContext(); - for (auto& surface_func : { &create_gpu_surface, &create_gpu_scratch_surface }) { - auto surface(surface_func(context, kOpaque_SkAlphaType, nullptr)); - - auto imageBackingStore = [reporter](SkImage* image) { - GrTexture* texture = as_IB(image)->peekTexture(); - if (!texture) { - ERRORF(reporter, "Not texture backed."); - return static_cast<intptr_t>(0); - } - return static_cast<intptr_t>(texture->uniqueID().asUInt()); - }; - - auto surfaceBackingStore = [reporter](SkSurface* surface) { - GrRenderTargetContext* rtc = - surface->getCanvas()->internal_private_accessTopLayerRenderTargetContext(); - GrRenderTarget* rt = rtc->accessRenderTarget(); - if (!rt) { - ERRORF(reporter, "Not render target backed."); - return static_cast<intptr_t>(0); - } - return static_cast<intptr_t>(rt->uniqueID().asUInt()); - }; - - test_unique_image_snap(reporter, surface.get(), false, imageBackingStore, - surfaceBackingStore); - - // Test again with a "direct" render target; - GrBackendObject textureObject = context->getGpu()->createTestingOnlyBackendTexture(nullptr, - 10, 10, kRGBA_8888_GrPixelConfig, true); - GrBackendTextureDesc desc; - desc.fConfig = kRGBA_8888_GrPixelConfig; - desc.fWidth = 10; - desc.fHeight = 10; - desc.fFlags = kRenderTarget_GrBackendTextureFlag; - desc.fTextureHandle = textureObject; - - { - sk_sp<SkSurface> surface(SkSurface::MakeFromBackendTexture(context, desc, nullptr)); - test_unique_image_snap(reporter, surface.get(), true, imageBackingStore, - surfaceBackingStore); - } - - context->getGpu()->deleteTestingOnlyBackendTexture(textureObject); - } -} -#endif - #if SK_SUPPORT_GPU static void test_backend_handle_unique_id( |