diff options
| author |  Hal Canary <halcanary@google.com> | 2018-01-19 18:18:20 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-19 18:18:24 +0000 |
| commit | 07320e46c0064dc1fe876f4621e94cb9ad529f85 (patch) | |
| tree | 45d4d7d185beaa1d58e4b67c7c9eb60d9892d86f /bench | |
| parent | b69a2f66448603c26b0265201cec7161cf6d6f75 (diff) | |
Revert "Move more internal methods from GrContext to GrContextPriv"
This reverts commit f440cecbfdf1910104f36aedd0e963da2ae8b6a8.
Reason for revert: breaking android builds.
Original change's description:
> Move more internal methods from GrContext to GrContextPriv
>
> TBR=bsalomon@google.com
> Change-Id: Ia8cf0e0d30451c69bc7a08215aafa6abe6e0ddbe
> Reviewed-on: https://skia-review.googlesource.com/97080
> 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: If263f8161f0fbe3fc6ee8f34bb09e237705c3694
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/97200
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/GrResourceCacheBench.cpp | 4 | ||||
| -rw-r--r-- | bench/SKPBench.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index a530e628e8..c48aed5e0b 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -83,7 +83,7 @@ protected: cache->purgeAllUnlocked(); SkASSERT(0 == cache->getResourceCount() && 0 == cache->getResourceBytes()); - GrGpu* gpu = context->contextPriv().getGpu(); + GrGpu* gpu = context->getGpu(); for (int i = 0; i < loops; ++i) { populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count); @@ -129,7 +129,7 @@ protected: cache->purgeAllUnlocked(); SkASSERT(0 == cache->getResourceCount() && 0 == cache->getResourceBytes()); - GrGpu* gpu = fContext->contextPriv().getGpu(); + GrGpu* gpu = fContext->getGpu(); populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count); } diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp index 4fbb1bba29..013ec53cda 100644 --- a/bench/SKPBench.cpp +++ b/bench/SKPBench.cpp @@ -12,7 +12,6 @@ #if SK_SUPPORT_GPU #include "GrContext.h" -#include "GrContextPriv.h" #endif // These CPU tile sizes are not good per se, but they are similar to what Chrome uses. @@ -190,7 +189,7 @@ void SKPBench::getGpuStats(SkCanvas* canvas, SkTArray<SkString>* keys, SkTArray< context->flush(); context->freeGpuResources(); context->resetContext(); - context->contextPriv().getGpu()->resetShaderCacheForTesting(); + context->getGpu()->resetShaderCacheForTesting(); draw_pic_for_stats(canvas, context, fPic.get(), keys, values, "first_frame"); // draw second frame |