From 0bd24dc41f2351d84f5fce32130668a5792d134b Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 16 Jan 2018 08:06:32 -0500 Subject: Funnel most proxy creation through GrProxyProvider This is to provide a choke point for DDL to create Lazy Proxies. Change-Id: If178da13bc6447b31b7601810236d34502d9efbd Reviewed-on: https://skia-review.googlesource.com/93303 Commit-Queue: Robert Phillips Reviewed-by: Greg Daniel --- tests/SpecialImageTest.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/SpecialImageTest.cpp') diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 6dfcfc4bd3..4b86697296 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -18,6 +18,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrContextPriv.h" +#include "GrProxyProvider.h" #include "GrSurfaceProxy.h" #include "GrTextureProxy.h" #include "SkGr.h" @@ -207,6 +208,7 @@ static void test_texture_backed(skiatest::Reporter* reporter, // Test out the SkSpecialImage::makeTextureImage entry point DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_MakeTexture, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); + GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); SkBitmap bm = create_bm(); const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); @@ -235,10 +237,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_MakeTexture, reporter, ctxInfo) // gpu const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info(), *context->caps()); - sk_sp proxy(GrSurfaceProxy::MakeDeferred( - context->contextPriv().proxyProvider(), - desc, SkBudgeted::kNo, - bm.getPixels(), bm.rowBytes())); + sk_sp proxy = proxyProvider->createTextureProxy( + desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes()); if (!proxy) { return; } @@ -265,13 +265,13 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_MakeTexture, reporter, ctxInfo) DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_Gpu, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); + GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); SkBitmap bm = create_bm(); const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info(), *context->caps()); - sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), - desc, SkBudgeted::kNo, - bm.getPixels(), bm.rowBytes())); + sk_sp proxy = proxyProvider->createTextureProxy( + desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes()); if (!proxy) { return; } @@ -300,6 +300,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_Gpu, reporter, ctxInfo) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_DeferredGpu, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); + GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); SkBitmap bm = create_bm(); GrSurfaceDesc desc; @@ -309,9 +310,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_DeferredGpu, reporter, ctxInfo) desc.fHeight = kFullSize; desc.fConfig = kSkia8888_GrPixelConfig; - sk_sp proxy(GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), - desc, SkBudgeted::kNo, - bm.getPixels(), 0)); + sk_sp proxy = proxyProvider->createTextureProxy( + desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes()); if (!proxy) { return; } -- cgit v1.2.3