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/TextureProxyTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/TextureProxyTest.cpp') diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index 82a726db99..914e83e7df 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -78,7 +78,7 @@ static sk_sp wrapped(skiatest::Reporter* reporter, static sk_sp wrapped_with_key(skiatest::Reporter* reporter, GrContext* context, SkBackingFit fit) { - GrResourceProvider* resourceProvider = context->resourceProvider(); + GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain(); static int kUniqueKeyData = 0; @@ -110,7 +110,7 @@ static sk_sp wrapped_with_key(skiatest::Reporter* reporter, static sk_sp create_wrapped_backend(GrContext* context, SkBackingFit fit, sk_sp* backingSurface) { GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceProvider* resourceProvider = context->resourceProvider(); + GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); const GrSurfaceDesc desc = make_desc(kNone_GrSurfaceFlags); @@ -132,9 +132,9 @@ static void basic_test(GrContext* context, sk_sp proxy, bool proxyIsCached) { static int id = 1; - GrResourceProvider* resourceProvider = context->resourceProvider(); + GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - GrResourceCache* cache = context->getResourceCache(); + GrResourceCache* cache = context->contextPriv().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->getResourceCache(); + GrResourceCache* cache = context->contextPriv().getResourceCache(); REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); sk_sp 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->resourceProvider(); - GrResourceCache* cache = context->getResourceCache(); + GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider(); + GrResourceCache* cache = context->contextPriv().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->getResourceCache(); + GrResourceCache* cache = context->contextPriv().getResourceCache(); REPORTER_ASSERT(reporter, !proxyProvider->numUniqueKeyProxies_TestOnly()); REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); -- cgit v1.2.3