From 6be756b673b823881e90a2ef68c12b640ddde549 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 16 Jan 2018 15:07:54 -0500 Subject: Move resourceProvider accessor to GrContextPriv (take 2) TBR=bsalomon@google.com Change-Id: I3fd46ebfad0d04b8a2bfa6190f81308f3a6be620 Reviewed-on: https://skia-review.googlesource.com/95121 Commit-Queue: Robert Phillips Reviewed-by: Greg Daniel --- tests/GrMipMappedTest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/GrMipMappedTest.cpp') diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 0ff0d2c8fb..04bcca7c4d 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -211,6 +211,8 @@ 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; @@ -240,7 +242,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn GrTextureProxy* texProxy = device->accessRenderTargetContext()->asTextureProxy(); REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped()); - texProxy->instantiate(context->resourceProvider()); + texProxy->instantiate(resourceProvider); GrTexture* texture = texProxy->priv().peekTexture(); REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped()); @@ -252,7 +254,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn texProxy = as_IB(image)->peekProxy(); REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped()); - texProxy->instantiate(context->resourceProvider()); + texProxy->instantiate(resourceProvider); texture = texProxy->priv().peekTexture(); REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped()); -- cgit v1.2.3