From 02242e82e4bf94a8f6862dadb5bf347ea5e31eb5 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Thu, 20 Apr 2017 13:30:34 -0400 Subject: Rm makeRenderTargetContext in favor of deferred version (take 2) This is a reland of: https://skia-review.googlesource.com/c/13001/ (Rm makeRenderTargetContext in favor of deferred version) Change-Id: Ife77b012d09c46895884a168fc5045bd92a4b919 Reviewed-on: https://skia-review.googlesource.com/13196 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- tests/RenderTargetContextTest.cpp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'tests/RenderTargetContextTest.cpp') diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp index 760b258d07..dbb41851c6 100644 --- a/tests/RenderTargetContextTest.cpp +++ b/tests/RenderTargetContextTest.cpp @@ -20,17 +20,10 @@ static const int kSize = 64; -static sk_sp get_rtc(GrContext* ctx, bool wrapped) { - - if (wrapped) { - return ctx->makeRenderTargetContext(SkBackingFit::kExact, - kSize, kSize, - kRGBA_8888_GrPixelConfig, nullptr); - } else { - return ctx->makeDeferredRenderTargetContext(SkBackingFit::kExact, - kSize, kSize, - kRGBA_8888_GrPixelConfig, nullptr); - } +static sk_sp get_rtc(GrContext* ctx) { + return ctx->makeDeferredRenderTargetContext(SkBackingFit::kExact, + kSize, kSize, + kRGBA_8888_GrPixelConfig, nullptr); } static void check_is_wrapped_status(skiatest::Reporter* reporter, @@ -47,16 +40,10 @@ static void check_is_wrapped_status(skiatest::Reporter* reporter, DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RenderTargetContextTest, reporter, ctxInfo) { GrContext* ctx = ctxInfo.grContext(); - // A wrapped rtCtx's textureProxy is also wrapped - { - sk_sp rtCtx(get_rtc(ctx, true)); - check_is_wrapped_status(reporter, rtCtx.get(), true); - } - // Calling instantiate on a GrRenderTargetContext's textureProxy also instantiates the // GrRenderTargetContext { - sk_sp rtCtx(get_rtc(ctx, false)); + sk_sp rtCtx(get_rtc(ctx)); check_is_wrapped_status(reporter, rtCtx.get(), false); @@ -71,7 +58,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RenderTargetContextTest, reporter, ctxInfo) { // readPixels switches a deferred rtCtx to wrapped { - sk_sp rtCtx(get_rtc(ctx, false)); + sk_sp rtCtx(get_rtc(ctx)); check_is_wrapped_status(reporter, rtCtx.get(), false); -- cgit v1.2.3