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/EGLImageTest.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/EGLImageTest.cpp')
| -rw-r--r-- | tests/EGLImageTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index dac78a89c0..efa7de20d7 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -28,7 +28,7 @@ static void cleanup(GLTestContext* glctx0, GrGLuint texID0, GLTestContext* glctx glctx1->makeCurrent(); if (grctx1) { if (backendTex1 && backendTex1->isValid()) { - GrGLGpu* gpu1 = static_cast<GrGLGpu*>(grctx1->contextPriv().getGpu()); + GrGLGpu* gpu1 = static_cast<GrGLGpu*>(grctx1->getGpu()); gpu1->deleteTestingOnlyBackendTexture(backendTex1); } } @@ -53,7 +53,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { if (kGLES_GrGLStandard != glCtx0->gl()->fStandard) { return; } - GrGLGpu* gpu0 = static_cast<GrGLGpu*>(context0->contextPriv().getGpu()); + GrGLGpu* gpu0 = static_cast<GrGLGpu*>(context0->getGpu()); if (!gpu0->glCaps().shaderCaps()->externalTextureSupport()) { return; } @@ -83,7 +83,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { // Use GL Context 1 to create a texture unknown to GrContext. context1->flush(); - GrGpu* gpu1 = context1->contextPriv().getGpu(); + GrGpu* gpu1 = context1->getGpu(); static const int kSize = 100; backendTexture1 = gpu1->createTestingOnlyBackendTexture(nullptr, kSize, kSize, kRGBA_8888_GrPixelConfig, |