diff options
author | Robert Phillips <robertphillips@google.com> | 2017-03-16 08:32:56 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-16 13:36:06 +0000 |
commit | b64bcbdc3a5aa7b9e3ff216e4617ddc1db9260b5 (patch) | |
tree | fe99f9fe4f379226b3593989aa6c46cb2969650d /tests | |
parent | 755a2c6b4229c86d22cd7dbd399abc97fefab4cb (diff) |
Remove budgeted parameter from SkSurface::makeImageSnapshot
This unused feature complicates MDB.
Chrome compiles locally for me with this CL.
Change-Id: I611e464885fb984030eace43ead42cf39d0e7f72
Reviewed-on: https://skia-review.googlesource.com/9734
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GrTextureMipMapInvalidationTest.cpp | 8 | ||||
-rw-r--r-- | tests/SurfaceTest.cpp | 39 |
2 files changed, 21 insertions, 26 deletions
diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp index 166c57c066..e7573dc010 100644 --- a/tests/GrTextureMipMapInvalidationTest.cpp +++ b/tests/GrTextureMipMapInvalidationTest.cpp @@ -20,13 +20,11 @@ // Tests that MIP maps are created and invalidated as expected when drawing to and from GrTextures. DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInfo) { auto isMipped = [] (SkSurface* surf) { - return as_IB(surf->makeImageSnapshot(SkBudgeted::kYes))-> - peekTexture()->texturePriv().hasMipMaps(); + return as_IB(surf->makeImageSnapshot())->peekTexture()->texturePriv().hasMipMaps(); }; auto mipsAreDirty = [] (SkSurface* surf) { - return as_IB(surf->makeImageSnapshot(SkBudgeted::kYes))-> - peekTexture()->texturePriv().mipMapsAreDirty(); + return as_IB(surf->makeImageSnapshot())->peekTexture()->texturePriv().mipMapsAreDirty(); }; GrContext* context = ctxInfo.grContext(); @@ -44,7 +42,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInf SkPaint paint; paint.setFilterQuality(kMedium_SkFilterQuality); surf2->getCanvas()->scale(0.2f, 0.2f); - surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(SkBudgeted::kYes), 0, 0, &paint); + surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint); surf2->getCanvas()->flush(); REPORTER_ASSERT(reporter, isMipped(surf1.get())); REPORTER_ASSERT(reporter, !mipsAreDirty(surf1.get())); diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index b85ac81788..6264196640 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -460,27 +460,24 @@ static SkBudgeted is_budgeted(const sk_sp<SkImage> image) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceBudget, reporter, ctxInfo) { SkImageInfo info = SkImageInfo::MakeN32Premul(8,8); - for (auto sbudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { - for (auto ibudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { - auto surface(SkSurface::MakeRenderTarget(ctxInfo.grContext(), sbudgeted, info)); - SkASSERT(surface); - REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface)); - - sk_sp<SkImage> image(surface->makeImageSnapshot(ibudgeted)); - - // Initially the image shares a texture with the surface, and the surface decides - // whether it is budgeted or not. - REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface)); - REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(image)); - - // Now trigger copy-on-write - surface->getCanvas()->clear(SK_ColorBLUE); - - // They don't share a texture anymore. They should each have made their own budget - // decision. - REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface)); - REPORTER_ASSERT(reporter, ibudgeted == is_budgeted(image)); - } + for (auto budgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { + auto surface(SkSurface::MakeRenderTarget(ctxInfo.grContext(), budgeted, info)); + SkASSERT(surface); + REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface)); + + sk_sp<SkImage> image(surface->makeImageSnapshot()); + + // Initially the image shares a texture with the surface, and the + // the budgets should always match. + REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface)); + REPORTER_ASSERT(reporter, budgeted == is_budgeted(image)); + + // Now trigger copy-on-write + surface->getCanvas()->clear(SK_ColorBLUE); + + // They don't share a texture anymore but the budgets should still match. + REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface)); + REPORTER_ASSERT(reporter, budgeted == is_budgeted(image)); } } #endif |