diff options
author | Leon Scroggins <scroggo@google.com> | 2018-01-20 17:09:02 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-20 17:09:10 +0000 |
commit | 2914555e004676465c5255d8b42ee0d25887ac73 (patch) | |
tree | a93a781cd867005eb72071577064667e970c8430 /tests/GrSurfaceTest.cpp | |
parent | 4f7f197c09443232f02cd81f3ac7fb5a216acd05 (diff) |
Revert "Move more internal methods from GrContext to GrContextPriv (take 2)"
This reverts commit c22e50bd317fe3658445c04e18a6e319d746c510.
Reason for revert: Speculative fix for Android roll
Original change's description:
> Move more internal methods from GrContext to GrContextPriv (take 2)
>
> Change-Id: I47108910517d61edeb52f82793d384fdb5605d45
> Reviewed-on: https://skia-review.googlesource.com/97241
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I3a77ac33c5f48529357cf9c683d5f4cacaa2379f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/97582
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'tests/GrSurfaceTest.cpp')
-rw-r--r-- | tests/GrSurfaceTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 72a92a709d..eab930145c 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -25,7 +25,6 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); auto resourceProvider = context->contextPriv().resourceProvider(); - GrGpu* gpu = context->contextPriv().getGpu(); GrSurfaceDesc desc; desc.fFlags = kRenderTarget_GrSurfaceFlag; @@ -52,7 +51,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { REPORTER_ASSERT(reporter, tex1.get() == tex1->asTexture()); REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1.get()) == tex1->asTexture()); - GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture( + GrBackendTexture backendTex = context->getGpu()->createTestingOnlyBackendTexture( nullptr, 256, 256, kRGBA_8888_GrPixelConfig, false, GrMipMapped::kNo); sk_sp<GrSurface> texRT2 = resourceProvider->wrapRenderableBackendTexture( @@ -67,7 +66,7 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) == static_cast<GrSurface*>(texRT2->asTexture())); - gpu->deleteTestingOnlyBackendTexture(&backendTex); + context->getGpu()->deleteTestingOnlyBackendTexture(&backendTex); } // This test checks that the isConfigTexturable and isConfigRenderable are |