diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-16 10:44:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 17:02:45 +0000 |
| commit | 1f9ed8501b0007846b3032f4bfc38aee98c175a1 (patch) | |
| tree | a342137e34180a110d1cd4129650a771290d0f17 /tests/ProxyTest.cpp | |
| parent | 20df20cfe822f613d6035baf5f5415a3a977e709 (diff) | |
Move resourceProvider accessor to GrContextPriv
Change-Id: I5cddd620a7ec4b006b7359864ede58e9d4dd684e
Reviewed-on: https://skia-review.googlesource.com/94340
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProxyTest.cpp')
| -rw-r--r-- | tests/ProxyTest.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
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); } } |