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/SurfaceSemaphoreTest.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/SurfaceSemaphoreTest.cpp')
-rw-r--r-- | tests/SurfaceSemaphoreTest.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp index eea6e37670..b4f63fec41 100644 --- a/tests/SurfaceSemaphoreTest.cpp +++ b/tests/SurfaceSemaphoreTest.cpp @@ -8,7 +8,6 @@ #include "SkTypes.h" #if SK_SUPPORT_GPU -#include "GrContextPriv.h" #include "GrContextFactory.h" #include "GrTest.h" #include "Test.h" @@ -133,7 +132,7 @@ void surface_semaphore_test(skiatest::Reporter* reporter, #ifdef SK_VULKAN if (kVulkan_GrBackend == mainInfo.backend()) { // Initialize the secondary semaphore instead of having Ganesh create one internally - GrVkGpu* gpu = static_cast<GrVkGpu*>(mainCtx->contextPriv().getGpu()); + GrVkGpu* gpu = static_cast<GrVkGpu*>(mainCtx->getGpu()); const GrVkInterface* interface = gpu->vkInterface(); VkDevice device = gpu->device(); @@ -236,7 +235,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(EmptySurfaceSemaphoreTest, reporter, ctxInfo) REPORTER_ASSERT(reporter, GrSemaphoresSubmitted::kYes == submitted); if (kOpenGL_GrBackend == ctxInfo.backend()) { - GrGLGpu* gpu = static_cast<GrGLGpu*>(ctx->contextPriv().getGpu()); + GrGLGpu* gpu = static_cast<GrGLGpu*>(ctx->getGpu()); const GrGLInterface* interface = gpu->glInterface(); GrGLsync sync = semaphore.glSync(); REPORTER_ASSERT(reporter, sync); @@ -247,7 +246,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(EmptySurfaceSemaphoreTest, reporter, ctxInfo) #ifdef SK_VULKAN if (kVulkan_GrBackend == ctxInfo.backend()) { - GrVkGpu* gpu = static_cast<GrVkGpu*>(ctx->contextPriv().getGpu()); + GrVkGpu* gpu = static_cast<GrVkGpu*>(ctx->getGpu()); const GrVkInterface* interface = gpu->vkInterface(); VkDevice device = gpu->device(); VkQueue queue = gpu->queue(); |