From 5ec26ae9bfca635ccc98283aad5deda11519d826 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Thu, 25 Feb 2016 08:33:02 -0800 Subject: Move Budgeted enum out of SkSurface, use in GrTextureProvider BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005 DOCS_PREVIEW= https://skia.org/?cl=1728093005 Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot Review URL: https://codereview.chromium.org/1728093005 --- tests/SurfaceTest.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'tests/SurfaceTest.cpp') diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 41fef617bc..7449f211b5 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -54,7 +54,7 @@ static SkSurface* create_gpu_surface(GrContext* context, SkAlphaType at = kPremu if (requestedInfo) { *requestedInfo = info; } - return SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info, 0, nullptr); + return SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info, 0, nullptr); } static SkSurface* create_gpu_scratch_surface(GrContext* context, SkAlphaType at = kPremul_SkAlphaType, @@ -63,7 +63,7 @@ static SkSurface* create_gpu_scratch_surface(GrContext* context, if (requestedInfo) { *requestedInfo = info; } - return SkSurface::NewRenderTarget(context, SkSurface::kYes_Budgeted, info, 0, nullptr); + return SkSurface::NewRenderTarget(context, SkBudgeted::kYes, info, 0, nullptr); } #endif @@ -77,7 +77,7 @@ DEF_TEST(SurfaceEmpty, reporter) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceEmpty_Gpu, reporter, context) { const SkImageInfo info = SkImageInfo::Make(0, 0, kN32_SkColorType, kPremul_SkAlphaType); REPORTER_ASSERT(reporter, nullptr == - SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info, 0, nullptr)); + SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info, 0, nullptr)); } #endif @@ -340,7 +340,7 @@ static void test_unique_image_snap(skiatest::Reporter* reporter, SkSurface* surf std::function surfaceBackingStore) { std::function ibs = imageBackingStore; std::function sbs = surfaceBackingStore; - static const SkSurface::Budgeted kB = SkSurface::kNo_Budgeted; + static const SkBudgeted kB = SkBudgeted::kNo; { SkAutoTUnref image(surface->newImageSnapshot(kB, SkSurface::kYes_ForceUnique)); REPORTER_ASSERT(reporter, !same_image_surf(image, surface, ibs, sbs)); @@ -699,22 +699,18 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceGetTexture_Gpu, reporter, context) { #include "SkImage_Gpu.h" #include "SkSurface_Gpu.h" -static SkSurface::Budgeted is_budgeted(SkSurface* surf) { - return ((SkSurface_Gpu*)surf)->getDevice()->accessRenderTarget()->resourcePriv().isBudgeted() ? - SkSurface::kYes_Budgeted : SkSurface::kNo_Budgeted; +static SkBudgeted is_budgeted(SkSurface* surf) { + return ((SkSurface_Gpu*)surf)->getDevice()->accessRenderTarget()->resourcePriv().isBudgeted(); } -static SkSurface::Budgeted is_budgeted(SkImage* image) { - return ((SkImage_Gpu*)image)->getTexture()->resourcePriv().isBudgeted() ? - SkSurface::kYes_Budgeted : SkSurface::kNo_Budgeted; +static SkBudgeted is_budgeted(SkImage* image) { + return ((SkImage_Gpu*)image)->getTexture()->resourcePriv().isBudgeted(); } DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceBudget, reporter, context) { SkImageInfo info = SkImageInfo::MakeN32Premul(8,8); - for (int i = 0; i < 2; ++i) { - SkSurface::Budgeted sbudgeted = i ? SkSurface::kYes_Budgeted : SkSurface::kNo_Budgeted; - for (int j = 0; j < 2; ++j) { - SkSurface::Budgeted ibudgeted = j ? SkSurface::kYes_Budgeted : SkSurface::kNo_Budgeted; + for (auto sbudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { + for (auto ibudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { SkAutoTUnref surface(SkSurface::NewRenderTarget(context, sbudgeted, info, 0)); SkASSERT(surface); -- cgit v1.2.3