From 1afd4cdb0800e2e395b465da24eb71e0e834dafa Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 8 Jan 2018 13:40:32 -0500 Subject: Add GrProxyProvider This pulls all the proxy tracking & creation functionality out of the GrResourceCache and GrResourceProvider and consolidates it in the GrProxyProvider. Change-Id: I7256f7c544319a70c1bd93dd5a9ccbe5fa0a544f Reviewed-on: https://skia-review.googlesource.com/91501 Commit-Queue: Robert Phillips Reviewed-by: Greg Daniel --- tests/SpecialImageTest.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/SpecialImageTest.cpp') diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 2ac80d6321..6dfcfc4bd3 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -17,6 +17,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrContextPriv.h" #include "GrSurfaceProxy.h" #include "GrTextureProxy.h" #include "SkGr.h" @@ -234,9 +235,10 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_MakeTexture, reporter, ctxInfo) // gpu const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info(), *context->caps()); - sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->resourceProvider(), - desc, SkBudgeted::kNo, - bm.getPixels(), bm.rowBytes())); + sk_sp proxy(GrSurfaceProxy::MakeDeferred( + context->contextPriv().proxyProvider(), + desc, SkBudgeted::kNo, + bm.getPixels(), bm.rowBytes())); if (!proxy) { return; } @@ -267,7 +269,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_Gpu, reporter, ctxInfo) { const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info(), *context->caps()); - sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->resourceProvider(), + sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes())); if (!proxy) { @@ -307,7 +309,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_DeferredGpu, reporter, ctxInfo) desc.fHeight = kFullSize; desc.fConfig = kSkia8888_GrPixelConfig; - sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->resourceProvider(), + sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), desc, SkBudgeted::kNo, bm.getPixels(), 0)); if (!proxy) { -- cgit v1.2.3