From be46e24d57537f7ab6854fcd6f6ec07e2c50495c Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 16 Jan 2018 18:33:07 +0000 Subject: 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 > Reviewed-by: Greg Daniel > Commit-Queue: Robert Phillips 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 Commit-Queue: Hal Canary --- tests/TransferPixelsTest.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/TransferPixelsTest.cpp') 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 buffer(resourceProvider->createBuffer(size, - kXferCpuToGpu_GrBufferType, - kDynamic_GrAccessPattern, - bufferFlags)); + sk_sp 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 tex = resourceProvider->createTexture(desc, SkBudgeted::kNo); + sk_sp tex = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); ////////////////////////// // transfer full data -- cgit v1.2.3