| Index: tools/gpu/GrTest.cpp
|
| diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
|
| index 5771a785325fabddac0060b4b685da4212cd0af7..6f9d2c4ee627a5e296542b276f455077a1e3b525 100644
|
| --- a/tools/gpu/GrTest.cpp
|
| +++ b/tools/gpu/GrTest.cpp
|
| @@ -222,10 +222,9 @@ void GrResourceCache::dumpStats(SkString* out) const {
|
|
|
| out->appendf("Budget: %d items %d bytes\n", fMaxCount, (int)fMaxBytes);
|
| out->appendf("\t\tEntry Count: current %d"
|
| - " (%d budgeted, %d external(%d borrowed, %d adopted), %d locked, %d scratch %.2g%% full), high %d\n",
|
| - stats.fTotal, fBudgetedCount, stats.fExternal, stats.fBorrowed,
|
| - stats.fAdopted, stats.fNumNonPurgeable, stats.fScratch, countUtilization,
|
| - fHighWaterCount);
|
| + " (%d budgeted, %d wrapped, %d locked, %d scratch %.2g%% full), high %d\n",
|
| + stats.fTotal, fBudgetedCount, stats.fWrapped, stats.fNumNonPurgeable,
|
| + stats.fScratch, countUtilization, fHighWaterCount);
|
| out->appendf("\t\tEntry Bytes: current %d (budgeted %d, %.2g%% full, %d unbudgeted) high %d\n",
|
| SkToInt(fBytes), SkToInt(fBudgetedBytes), byteUtilization,
|
| SkToInt(stats.fUnbudgetedSize), SkToInt(fHighWaterBytes));
|
| @@ -323,12 +322,12 @@ private:
|
|
|
| void xferBarrier(GrRenderTarget*, GrXferBarrierType) override {}
|
|
|
| - GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
|
| + GrTexture* onCreateTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
|
| const SkTArray<GrMipLevel>& texels) override {
|
| return nullptr;
|
| }
|
|
|
| - GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle,
|
| + GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
|
| const SkTArray<GrMipLevel>& texels) override {
|
| return nullptr;
|
| }
|
|
|