Revert "Rm makeRenderTargetContext in favor of deferred version"
This reverts commit d83ec0441279b79551b4ecb4598696249ea55145.
Reason for revert: various bot failures
Original change's description:
> 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>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I4e67a20cbe658b24725dcf386ac8bfdd127647ea
Reviewed-on: https://skia-review.googlesource.com/13131
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp
index 7bf1ab7..3db0473 100644
--- a/tests/RenderTargetContextTest.cpp
+++ b/tests/RenderTargetContextTest.cpp
@@ -15,10 +15,17 @@
static const int kSize = 64;
-static sk_sp<GrRenderTargetContext> get_rtc(GrContext* ctx) {
- return ctx->makeDeferredRenderTargetContext(SkBackingFit::kExact,
- kSize, kSize,
- kRGBA_8888_GrPixelConfig, nullptr);
+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 void check_is_wrapped_status(skiatest::Reporter* reporter,
@@ -35,10 +42,16 @@
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));
+ sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx, false));
check_is_wrapped_status(reporter, rtCtx.get(), false);
@@ -53,7 +66,7 @@
// readPixels switches a deferred rtCtx to wrapped
{
- sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx));
+ sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx, false));
check_is_wrapped_status(reporter, rtCtx.get(), false);