From 1f9ed8501b0007846b3032f4bfc38aee98c175a1 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 16 Jan 2018 10:44:11 -0500 Subject: Move resourceProvider accessor to GrContextPriv Change-Id: I5cddd620a7ec4b006b7359864ede58e9d4dd684e Reviewed-on: https://skia-review.googlesource.com/94340 Reviewed-by: Brian Salomon Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- tests/ProxyTest.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/ProxyTest.cpp') diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 077045f5db..0636ed4ce4 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -107,7 +107,7 @@ static void check_texture(skiatest::Reporter* reporter, DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) { GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = ctxInfo.grContext()->resourceProvider(); + GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); const GrCaps& caps = *ctxInfo.grContext()->caps(); int attempt = 0; // useful for debugging @@ -196,7 +196,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider(); - GrResourceProvider* provider = ctxInfo.grContext()->resourceProvider(); + GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); const GrCaps& caps = *ctxInfo.grContext()->caps(); static const int kWidthHeight = 100; @@ -227,7 +227,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { backendRT, origin)); check_surface(reporter, sProxy.get(), origin, kWidthHeight, kWidthHeight, config, SkBudgeted::kNo); - check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(), + check_rendertarget(reporter, caps, resourceProvider, + sProxy->asRenderTargetProxy(), supportedNumSamples, SkBackingFit::kExact, 0, true); } @@ -243,7 +244,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { check_surface(reporter, sProxy.get(), origin, kWidthHeight, kWidthHeight, config, budgeted); - check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(), + check_rendertarget(reporter, caps, resourceProvider, + sProxy->asRenderTargetProxy(), supportedNumSamples, SkBackingFit::kExact, caps.maxWindowRectangles(), true); } else { @@ -259,7 +261,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { check_surface(reporter, sProxy.get(), origin, kWidthHeight, kWidthHeight, config, budgeted); - check_texture(reporter, provider, sProxy->asTextureProxy(), + check_texture(reporter, resourceProvider, sProxy->asTextureProxy(), SkBackingFit::kExact, true); } } -- cgit v1.2.3