Rm makeRenderTargetContext in favor of deferred version

Change-Id: Ifdf67453607256ba7cdb0837263377bd83907212
Reviewed-on: https://skia-review.googlesource.com/13001
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 6 insertions, 19 deletions

diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp
index 3db0473b62..7bf1ab73c0 100644
--- a/tests/RenderTargetContextTest.cpp
+++ b/tests/RenderTargetContextTest.cpp
@@ -15,17 +15,10 @@
 
 static const int kSize = 64;
 
-static sk_sp<GrRenderTargetContext> 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<GrRenderTargetContext> get_rtc(GrContext* ctx) {
+    return ctx->makeDeferredRenderTargetContext(SkBackingFit::kExact,
+                                                kSize, kSize,
+                                                kRGBA_8888_GrPixelConfig, nullptr);
 }
 
 static void check_is_wrapped_status(skiatest::Reporter* reporter,
@@ -42,16 +35,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<GrRenderTargetContext> 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<GrRenderTargetContext> rtCtx(get_rtc(ctx, false));
+        sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx));
 
         check_is_wrapped_status(reporter, rtCtx.get(), false);
 
@@ -66,7 +53,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RenderTargetContextTest, reporter, ctxInfo) {
 
     // readPixels switches a deferred rtCtx to wrapped
     {
-        sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx, false));
+        sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx));
 
         check_is_wrapped_status(reporter, rtCtx.get(), false);