diff options
author | 2018-01-16 18:33:07 +0000 | |
---|---|---|
committer | 2018-01-16 18:33:14 +0000 | |
commit | be46e24d57537f7ab6854fcd6f6ec07e2c50495c (patch) | |
tree | 8a0304af3a4ea0561af8ecced5b645250f0dd55b /tests | |
parent | 301152cc58e937561dfd6fa93099778fad5b01b3 (diff) |
Revert "Move resourceProvider accessor to GrContextPriv"
This reverts commit 1f9ed8501b0007846b3032f4bfc38aee98c175a1.
Reason for revert:
1. breaking android roll
2. breaking Build-Debian9-Clang-arm-Release-Android_API26
Original change's description:
> 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>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I20b2d267c0925f20453b635663654967199a1197
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/94964
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/BlendTest.cpp | 4 | ||||
-rw-r--r-- | tests/ClipStackTest.cpp | 4 | ||||
-rw-r--r-- | tests/GrMipMappedTest.cpp | 6 | ||||
-rw-r--r-- | tests/GrPipelineDynamicStateTest.cpp | 2 | ||||
-rw-r--r-- | tests/GrSurfaceTest.cpp | 12 | ||||
-rw-r--r-- | tests/ImageFilterCacheTest.cpp | 2 | ||||
-rw-r--r-- | tests/IntTextureTest.cpp | 5 | ||||
-rw-r--r-- | tests/PathRendererCacheTests.cpp | 2 | ||||
-rw-r--r-- | tests/ProcessorTest.cpp | 10 | ||||
-rw-r--r-- | tests/ProxyRefTest.cpp | 2 | ||||
-rw-r--r-- | tests/ProxyTest.cpp | 12 | ||||
-rw-r--r-- | tests/ResourceAllocatorTest.cpp | 2 | ||||
-rw-r--r-- | tests/ResourceCacheTest.cpp | 32 | ||||
-rw-r--r-- | tests/SurfaceTest.cpp | 5 | ||||
-rw-r--r-- | tests/TextureProxyTest.cpp | 16 | ||||
-rwxr-xr-x | tests/TransferPixelsTest.cpp | 12 | ||||
-rw-r--r-- | tests/WritePixelsTest.cpp | 2 |
17 files changed, 56 insertions, 74 deletions
diff --git a/tests/BlendTest.cpp b/tests/BlendTest.cpp index b17b9f1e45..bf985aa2ae 100644 --- a/tests/BlendTest.cpp +++ b/tests/BlendTest.cpp @@ -95,9 +95,7 @@ static sk_sp<SkSurface> create_gpu_surface_backend_texture_as_render_target( backingDesc.fConfig = config; backingDesc.fSampleCnt = sampleCnt; - auto resourceProvider = context->contextPriv().resourceProvider(); - - *backingSurface = resourceProvider->createTexture(backingDesc, SkBudgeted::kNo); + *backingSurface = context->resourceProvider()->createTexture(backingDesc, SkBudgeted::kNo); if (!(*backingSurface)) { return nullptr; } diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index c078422868..fe24bc14e6 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -1486,7 +1486,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) { path.setFillType(SkPath::kEvenOdd_FillType); static const char* kTag = GrClipStackClip::kMaskTestTag; - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); static constexpr int kN = 5; @@ -1496,7 +1496,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) { stack.save(); stack.clipPath(path, m, SkClipOp::kIntersect, true); sk_sp<GrTextureProxy> mask = GrClipStackClip(&stack).testingOnly_createClipMask(context); - mask->instantiate(context->contextPriv().resourceProvider()); + mask->instantiate(context->resourceProvider()); GrTexture* tex = mask->priv().peekTexture(); REPORTER_ASSERT(reporter, 0 == strcmp(tex->getUniqueKey().tag(), kTag)); // Make sure mask isn't pinned in cache. diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 04bcca7c4d..0ff0d2c8fb 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -211,8 +211,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn return; } - auto resourceProvider = context->contextPriv().resourceProvider(); - for (auto willUseMips : {false, true}) { for (auto isWrapped : {false, true}) { GrMipMapped mipMapped = willUseMips ? GrMipMapped::kYes : GrMipMapped::kNo; @@ -242,7 +240,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn GrTextureProxy* texProxy = device->accessRenderTargetContext()->asTextureProxy(); REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped()); - texProxy->instantiate(resourceProvider); + texProxy->instantiate(context->resourceProvider()); GrTexture* texture = texProxy->priv().peekTexture(); REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped()); @@ -254,7 +252,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn texProxy = as_IB(image)->peekProxy(); REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped()); - texProxy->instantiate(resourceProvider); + texProxy->instantiate(context->resourceProvider()); texture = texProxy->priv().peekTexture(); REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped()); diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp index cd1ce1e053..f65744abeb 100644 --- a/tests/GrPipelineDynamicStateTest.cpp +++ b/tests/GrPipelineDynamicStateTest.cpp @@ -146,7 +146,7 @@ private: DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrPipelineDynamicStateTest, reporter, ctxInfo) { GrContext* const context = ctxInfo.grContext(); - GrResourceProvider* rp = context->contextPriv().resourceProvider(); + GrResourceProvider* rp = context->resourceProvider(); sk_sp<GrRenderTargetContext> rtc( context->makeDeferredRenderTargetContext(SkBackingFit::kExact, kScreenSize, kScreenSize, diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index eab930145c..582510c1b4 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -24,8 +24,6 @@ // and render targets to GrSurface all work as expected. DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); - auto resourceProvider = context->contextPriv().resourceProvider(); - GrSurfaceDesc desc; desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fOrigin = kBottomLeft_GrSurfaceOrigin; @@ -33,7 +31,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { desc.fHeight = 256; desc.fConfig = kRGBA_8888_GrPixelConfig; desc.fSampleCnt = 0; - sk_sp<GrSurface> texRT1 = resourceProvider->createTexture(desc, SkBudgeted::kNo); + sk_sp<GrSurface> texRT1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asRenderTarget()); REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asTexture()); @@ -46,7 +44,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { desc.fFlags = kNone_GrSurfaceFlags; desc.fOrigin = kTopLeft_GrSurfaceOrigin; - sk_sp<GrTexture> tex1 = resourceProvider->createTexture(desc, SkBudgeted::kNo); + sk_sp<GrTexture> tex1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); REPORTER_ASSERT(reporter, nullptr == tex1->asRenderTarget()); REPORTER_ASSERT(reporter, tex1.get() == tex1->asTexture()); REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1.get()) == tex1->asTexture()); @@ -54,8 +52,8 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { GrBackendTexture backendTex = context->getGpu()->createTestingOnlyBackendTexture( nullptr, 256, 256, kRGBA_8888_GrPixelConfig, false, GrMipMapped::kNo); - sk_sp<GrSurface> texRT2 = resourceProvider->wrapRenderableBackendTexture( - backendTex, 0, kBorrow_GrWrapOwnership); + sk_sp<GrSurface> texRT2 = context->resourceProvider()->wrapRenderableBackendTexture( + backendTex, 0, kBorrow_GrWrapOwnership); REPORTER_ASSERT(reporter, texRT2.get() == texRT2->asRenderTarget()); REPORTER_ASSERT(reporter, texRT2.get() == texRT2->asTexture()); @@ -74,7 +72,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSurfaceRenderability, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = context->resourceProvider(); const GrCaps* caps = context->caps(); GrPixelConfig configs[] = { diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index 3105e9bb00..c33080888c 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -209,7 +209,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_ImageBackedGPU, reporter, ct return; } - if (!srcProxy->instantiate(context->contextPriv().resourceProvider())) { + if (!srcProxy->instantiate(context->resourceProvider())) { return; } GrTexture* tex = srcProxy->priv().peekTexture(); diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp index 0bbb0718dc..2968c76d15 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -41,8 +41,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { } GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - auto resourceProvider = context->contextPriv().resourceProvider(); - static const int kS = UINT8_MAX + 1; static const size_t kRowBytes = kS * sizeof(int32_t); @@ -280,7 +278,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { // No rendering to integer textures. GrSurfaceDesc intRTDesc = desc; intRTDesc.fFlags = kRenderTarget_GrSurfaceFlag; - sk_sp<GrTexture> temp(resourceProvider->createTexture(intRTDesc, SkBudgeted::kYes)); + sk_sp<GrTexture> temp(context->resourceProvider()->createTexture(intRTDesc, + SkBudgeted::kYes)); REPORTER_ASSERT(reporter, !temp); } } diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp index cc645827d9..a3e272c81b 100644 --- a/tests/PathRendererCacheTests.cpp +++ b/tests/PathRendererCacheTests.cpp @@ -77,7 +77,7 @@ static void test_path(skiatest::Reporter* reporter, sk_sp<GrContext> ctx = GrContext::MakeMock(nullptr); // The cache needs to be big enough that nothing gets flushed, or our expectations can be wrong ctx->setResourceCacheLimits(100, 1000000); - GrResourceCache* cache = ctx->contextPriv().getResourceCache(); + GrResourceCache* cache = ctx->getResourceCache(); sk_sp<GrRenderTargetContext> rtc(ctx->makeDeferredRenderTargetContext( SkBackingFit::kApprox, 800, 800, kRGBA_8888_GrPixelConfig, nullptr, 0, diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 26f10a383a..e675335118 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -158,7 +158,6 @@ void testingOnly_getIORefCnts(GrTextureProxy* proxy, int* refCnt, int* readCnt, DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); GrSurfaceDesc desc; desc.fOrigin = kTopLeft_GrSurfaceOrigin; @@ -182,7 +181,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { sk_sp<GrTextureProxy> proxy4 = proxyProvider->createProxy(desc, SkBackingFit::kExact, SkBudgeted::kYes); sk_sp<GrBuffer> buffer(texelBufferSupport - ? resourceProvider->createBuffer( + ? context->resourceProvider()->createBuffer( 1024, GrBufferType::kTexel_GrBufferType, GrAccessPattern::kStatic_GrAccessPattern, 0) : nullptr); @@ -353,7 +352,6 @@ sk_sp<GrTextureProxy> make_input_texture(GrProxyProvider* proxyProvider, int wid DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - auto resourceProvider = context->contextPriv().resourceProvider(); using FPFactory = GrFragmentProcessorTestFactory; uint32_t seed = 0; @@ -393,7 +391,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, repor } for (int j = 0; j < timesToInvokeFactory; ++j) { fp = FPFactory::MakeIdx(i, &testData); - if (!fp->instantiate(resourceProvider)) { + if (!fp->instantiate(context->resourceProvider())) { continue; } @@ -492,7 +490,6 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, repor DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorCloneTest, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - auto resourceProvider = context->contextPriv().resourceProvider(); SkRandom random; @@ -525,7 +522,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorCloneTest, reporter, ctxInfo) { continue; } const char* name = fp->name(); - if (!fp->instantiate(resourceProvider) || !clone->instantiate(resourceProvider)) { + if (!fp->instantiate(context->resourceProvider()) || + !clone->instantiate(context->resourceProvider())) { continue; } REPORTER_ASSERT(reporter, !strcmp(fp->name(), clone->name())); diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index e84e6e7585..acd17be790 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -91,7 +91,7 @@ static sk_sp<GrTextureProxy> make_wrapped(GrProxyProvider* proxyProvider) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = ctxInfo.grContext()->resourceProvider(); for (auto make : { make_deferred, make_wrapped }) { // A single write diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 0636ed4ce4..077045f5db 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()->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = ctxInfo.grContext()->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* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); + GrResourceProvider* provider = ctxInfo.grContext()->resourceProvider(); const GrCaps& caps = *ctxInfo.grContext()->caps(); static const int kWidthHeight = 100; @@ -227,8 +227,7 @@ 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, resourceProvider, - sProxy->asRenderTargetProxy(), + check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(), supportedNumSamples, SkBackingFit::kExact, 0, true); } @@ -244,8 +243,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { check_surface(reporter, sProxy.get(), origin, kWidthHeight, kWidthHeight, config, budgeted); - check_rendertarget(reporter, caps, resourceProvider, - sProxy->asRenderTargetProxy(), + check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(), supportedNumSamples, SkBackingFit::kExact, caps.maxWindowRectangles(), true); } else { @@ -261,7 +259,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { check_surface(reporter, sProxy.get(), origin, kWidthHeight, kWidthHeight, config, budgeted); - check_texture(reporter, resourceProvider, sProxy->asTextureProxy(), + check_texture(reporter, provider, sProxy->asTextureProxy(), SkBackingFit::kExact, true); } } diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp index 55a7766944..6ca4b0cf5c 100644 --- a/tests/ResourceAllocatorTest.cpp +++ b/tests/ResourceAllocatorTest.cpp @@ -101,7 +101,7 @@ static void non_overlap_test(skiatest::Reporter* reporter, GrResourceProvider* r DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceAllocatorTest, reporter, ctxInfo) { GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = ctxInfo.grContext()->resourceProvider(); struct TestCase { ProxyParams fP1; diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index dd122a0dea..96cda795df 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -127,15 +127,14 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl return; } - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* provider = context->resourceProvider(); - sk_sp<GrRenderTarget> smallRT0 = create_RT_with_SB(resourceProvider, 4, 0, SkBudgeted::kYes); + sk_sp<GrRenderTarget> smallRT0 = create_RT_with_SB(provider, 4, 0, SkBudgeted::kYes); REPORTER_ASSERT(reporter, smallRT0); { // Two budgeted RTs with the same desc should share a stencil buffer. - sk_sp<GrRenderTarget> smallRT1 = create_RT_with_SB(resourceProvider, 4, 0, - SkBudgeted::kYes); + sk_sp<GrRenderTarget> smallRT1 = create_RT_with_SB(provider, 4, 0, SkBudgeted::kYes); REPORTER_ASSERT(reporter, smallRT1); REPORTER_ASSERT(reporter, get_SB(smallRT0.get()) == get_SB(smallRT1.get())); @@ -143,7 +142,7 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl { // An unbudgeted RT with the same desc should also share. - sk_sp<GrRenderTarget> smallRT2 = create_RT_with_SB(resourceProvider, 4, 0, SkBudgeted::kNo); + sk_sp<GrRenderTarget> smallRT2 = create_RT_with_SB(provider, 4, 0, SkBudgeted::kNo); REPORTER_ASSERT(reporter, smallRT2); REPORTER_ASSERT(reporter, get_SB(smallRT0.get()) == get_SB(smallRT2.get())); @@ -151,7 +150,7 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl { // An RT with a much larger size should not share. - sk_sp<GrRenderTarget> bigRT = create_RT_with_SB(resourceProvider, 400, 0, SkBudgeted::kNo); + sk_sp<GrRenderTarget> bigRT = create_RT_with_SB(provider, 400, 0, SkBudgeted::kNo); REPORTER_ASSERT(reporter, bigRT); REPORTER_ASSERT(reporter, get_SB(smallRT0.get()) != get_SB(bigRT.get())); @@ -160,8 +159,8 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl int smallSampleCount = context->caps()->getSampleCount(4, kRGBA_8888_GrPixelConfig); if (smallSampleCount > 0) { // An RT with a different sample count should not share. - sk_sp<GrRenderTarget> smallMSAART0 = create_RT_with_SB(resourceProvider, 4, - smallSampleCount, SkBudgeted::kNo); + sk_sp<GrRenderTarget> smallMSAART0 = create_RT_with_SB(provider, 4, smallSampleCount, + SkBudgeted::kNo); #ifdef SK_BUILD_FOR_ANDROID if (!smallMSAART0) { // The nexus player seems to fail to create MSAA textures. @@ -175,8 +174,7 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl { // A second MSAA RT should share with the first MSAA RT. - sk_sp<GrRenderTarget> smallMSAART1 = create_RT_with_SB(resourceProvider, 4, - smallSampleCount, + sk_sp<GrRenderTarget> smallMSAART1 = create_RT_with_SB(provider, 4, smallSampleCount, SkBudgeted::kNo); REPORTER_ASSERT(reporter, smallMSAART1); @@ -187,8 +185,7 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl // samples didn't get rounded up to >= 8 or else they could share.). int bigSampleCount = context->caps()->getSampleCount(8, kRGBA_8888_GrPixelConfig); if (bigSampleCount != smallSampleCount) { - sk_sp<GrRenderTarget> smallMSAART2 = create_RT_with_SB(resourceProvider, 4, - bigSampleCount, + sk_sp<GrRenderTarget> smallMSAART2 = create_RT_with_SB(provider, 4, bigSampleCount, SkBudgeted::kNo); REPORTER_ASSERT(reporter, smallMSAART2); @@ -199,7 +196,6 @@ DEF_GPUTEST_FOR_CONTEXTS(ResourceCacheStencilBuffers, &is_rendering_and_not_angl DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceCacheWrappedResources, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); GrGpu* gpu = context->getGpu(); // this test is only valid for GL if (!gpu || !gpu->glContextForTesting()) { @@ -224,10 +220,10 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceCacheWrappedResources, reporter, ctxI context->resetContext(); - sk_sp<GrTexture> borrowed(resourceProvider->wrapBackendTexture( + sk_sp<GrTexture> borrowed(context->resourceProvider()->wrapBackendTexture( backendTextures[0], kBorrow_GrWrapOwnership)); - sk_sp<GrTexture> adopted(resourceProvider->wrapBackendTexture( + sk_sp<GrTexture> adopted(context->resourceProvider()->wrapBackendTexture( backendTextures[1], kAdopt_GrWrapOwnership)); REPORTER_ASSERT(reporter, borrowed != nullptr && adopted != nullptr); @@ -353,12 +349,12 @@ public: fContext = GrContext::MakeMock(nullptr); SkASSERT(fContext); fContext->setResourceCacheLimits(maxCnt, maxBytes); - GrResourceCache* cache = fContext->contextPriv().getResourceCache(); + GrResourceCache* cache = fContext->getResourceCache(); cache->purgeAllUnlocked(); SkASSERT(0 == cache->getResourceCount() && 0 == cache->getResourceBytes()); } - GrResourceCache* cache() { return fContext->contextPriv().getResourceCache(); } + GrResourceCache* cache() { return fContext->getResourceCache(); } GrContext* context() { return fContext.get(); } @@ -1681,7 +1677,7 @@ static sk_sp<GrTextureProxy> make_mipmap_proxy(GrProxyProvider* proxyProvider, DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GPUMemorySize, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = context->resourceProvider(); static const int kSize = 64; diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 7f0d9973b5..a07b3361ef 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -783,8 +783,6 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SurfaceAttachStencil_Gpu, reporter, ctxInf } static const uint32_t kOrigColor = 0xFFAABBCC; - auto resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider(); - for (auto& surfaceFunc : {&create_gpu_surface_backend_texture, &create_gpu_surface_backend_texture_as_render_target}) { for (int sampleCnt : {0, 4, 8}) { @@ -800,7 +798,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SurfaceAttachStencil_Gpu, reporter, ctxInf // our surface functions. GrRenderTarget* rt = surface->getCanvas() ->internal_private_accessTopLayerRenderTargetContext()->accessRenderTarget(); - REPORTER_ASSERT(reporter, resourceProvider->attachStencilAttachment(rt)); + REPORTER_ASSERT(reporter, + ctxInfo.grContext()->resourceProvider()->attachStencilAttachment(rt)); gpu->deleteTestingOnlyBackendTexture(&backendTex); } } diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index 914e83e7df..82a726db99 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -78,7 +78,7 @@ static sk_sp<GrTextureProxy> wrapped(skiatest::Reporter* reporter, static sk_sp<GrTextureProxy> wrapped_with_key(skiatest::Reporter* reporter, GrContext* context, SkBackingFit fit) { - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = context->resourceProvider(); static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain(); static int kUniqueKeyData = 0; @@ -110,7 +110,7 @@ static sk_sp<GrTextureProxy> wrapped_with_key(skiatest::Reporter* reporter, static sk_sp<GrTextureProxy> create_wrapped_backend(GrContext* context, SkBackingFit fit, sk_sp<GrTexture>* backingSurface) { GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = context->resourceProvider(); const GrSurfaceDesc desc = make_desc(kNone_GrSurfaceFlags); @@ -132,9 +132,9 @@ static void basic_test(GrContext* context, sk_sp<GrTextureProxy> proxy, bool proxyIsCached) { static int id = 1; - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceProvider* resourceProvider = context->resourceProvider(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); int startCacheCount = cache->getResourceCount(); @@ -212,7 +212,7 @@ static void basic_test(GrContext* context, static void invalidation_test(GrContext* context, skiatest::Reporter* reporter) { GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); sk_sp<SkImage> rasterImg; @@ -254,8 +254,8 @@ static void invalidation_test(GrContext* context, skiatest::Reporter* reporter) // Test if invalidating unique ids prior to instantiating operates as expected static void invalidation_and_instantiation_test(GrContext* context, skiatest::Reporter* reporter) { GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceProvider* resourceProvider = context->resourceProvider(); + GrResourceCache* cache = context->getResourceCache(); REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain(); @@ -294,7 +294,7 @@ static void invalidation_and_instantiation_test(GrContext* context, skiatest::Re DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TextureProxyTest, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); REPORTER_ASSERT(reporter, !proxyProvider->numUniqueKeyProxies_TestOnly()); REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index ee1a233d63..b59495f0f5 100755 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp @@ -68,8 +68,6 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix return; } - auto resourceProvider = context->contextPriv().resourceProvider(); - // set up the data const int kTextureWidth = 16; const int kTextureHeight = 16; @@ -84,10 +82,10 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix // create and fill transfer buffer size_t size = rowBytes*kBufferHeight; uint32_t bufferFlags = GrResourceProvider::kNoPendingIO_Flag; - sk_sp<GrBuffer> buffer(resourceProvider->createBuffer(size, - kXferCpuToGpu_GrBufferType, - kDynamic_GrAccessPattern, - bufferFlags)); + sk_sp<GrBuffer> buffer(context->resourceProvider()->createBuffer(size, + kXferCpuToGpu_GrBufferType, + kDynamic_GrAccessPattern, + bufferFlags)); if (!buffer) { return; } @@ -104,7 +102,7 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix desc.fHeight = kTextureHeight; desc.fConfig = config; desc.fSampleCnt = 0; - sk_sp<GrTexture> tex = resourceProvider->createTexture(desc, SkBudgeted::kNo); + sk_sp<GrTexture> tex = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); ////////////////////////// // transfer full data diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index a41e8f4071..b3da67bb96 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -504,7 +504,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WritePixelsPendingIO, reporter, ctxInfo) { sk_sp<GrTextureProxy> temp = proxyProvider->createProxy(desc, SkBackingFit::kApprox, SkBudgeted::kYes); - temp->instantiate(context->contextPriv().resourceProvider()); + temp->instantiate(context->resourceProvider()); } // Create the surfaces and flush them to ensure there is no lingering pendingIO |