diff options
| author | bsalomon <bsalomon@google.com> | 2014-10-24 09:34:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 09:34:41 -0700 |
| commit | 24234fe77718a553ccc6ffdea0f2ee3ef414e0b6 (patch) | |
| tree | 21f90c197b4bf34e17dd99dbb4ee6f7fd9d71835 /tools | |
| parent | 42d1db2ccc42b18d6c906de7039b18acb65f4525 (diff) | |
| download | skia-24234fe77718a553ccc6ffdea0f2ee3ef414e0b6.tar.gz | |
Build gpu stats tracking in dev builds.
Fix cache stats, add more info.
BUG=skia:2889
Review URL: https://codereview.chromium.org/655263005
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bench_pictures_main.cpp | 2 | ||||
| -rw-r--r-- | tools/render_pictures_main.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index 93ee308ae..e8c4063d7 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -471,7 +471,7 @@ int tool_main(int argc, char** argv) { } #endif -#if GR_GPU_STATS +#if GR_GPU_STATS && SK_SUPPORT_GPU if (FLAGS_gpuStats && benchmark.renderer()->isUsingGpuDevice()) { GrContext* ctx = benchmark.renderer()->getGrContext(); SkDebugf("RenderTarget Binds: %d\n", ctx->gpuStats()->renderTargetBinds()); diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp index 6faa81ac0..91b6481b6 100644 --- a/tools/render_pictures_main.cpp +++ b/tools/render_pictures_main.cpp @@ -474,8 +474,7 @@ int tool_main(int argc, char** argv) { SkDebugf("Failed to render %i pictures.\n", failures); return 1; } -#if SK_SUPPORT_GPU -#if GR_CACHE_STATS +#if GR_CACHE_STATS && SK_SUPPORT_GPU if (renderer->isUsingGpuDevice()) { GrContext* ctx = renderer->getGrContext(); ctx->printCacheStats(); @@ -484,14 +483,15 @@ int tool_main(int argc, char** argv) { #endif } #endif -#if GR_GPU_STATS + +#if GR_GPU_STATS && SK_SUPPORT_GPU if (FLAGS_gpuStats && renderer->isUsingGpuDevice()) { GrContext* ctx = renderer->getGrContext(); SkDebugf("RenderTarget Binds: %d\n", ctx->gpuStats()->renderTargetBinds()); SkDebugf("Shader Compilations: %d\n", ctx->gpuStats()->shaderCompilations()); } #endif -#endif + if (FLAGS_writeJsonSummaryPath.count() == 1) { // If there were any descriptions on the command line, insert them now. for (int i=0; i<FLAGS_descriptions.count(); i++) { |