diff options
| -rw-r--r-- | bench/nanobench.cpp | 14 | ||||
| -rw-r--r-- | dm/DM.cpp | 2 | ||||
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 7 |
3 files changed, 19 insertions, 4 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 2758528a96..a5a96aa613 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -576,6 +576,10 @@ int nanobench_main() { gGrFactory.reset(SkNEW_ARGS(GrContextFactory, (grContextOpts))); #endif + if (FLAGS_veryVerbose) { + FLAGS_verbose = true; + } + if (kAutoTuneLoops != FLAGS_loops) { FLAGS_samples = 1; FLAGS_gpuFrameLag = 0; @@ -719,17 +723,23 @@ int nanobench_main() { , bench->getUniqueName() ); } +#if SK_SUPPORT_GPU && GR_CACHE_STATS + if (FLAGS_veryVerbose && + Benchmark::kGPU_Backend == targets[j]->config.backend) { + gGrFactory->get(targets[j]->config.ctxType)->printCacheStats(); + } +#endif } targets.deleteAll(); - #if SK_SUPPORT_GPU +#if SK_SUPPORT_GPU if (FLAGS_abandonGpuContext) { gGrFactory->abandonContexts(); } if (FLAGS_resetGpuContext || FLAGS_abandonGpuContext) { gGrFactory->destroyContexts(); } - #endif +#endif } return 0; @@ -189,7 +189,7 @@ int dm_main() { SkAutoGraphics ag; SkTaskGroup::Enabler enabled(FLAGS_threads); - if (FLAGS_dryRun) { + if (FLAGS_dryRun || FLAGS_veryVerbose) { FLAGS_verbose = true; } #if SK_ENABLE_INST_COUNT diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index 65d65d9598..fb170a26b9 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -1,7 +1,7 @@ #include "DMGpuGMTask.h" #include "DMUtil.h" #include "DMWriteTask.h" -#include "SkCommandLineFlags.h" +#include "SkCommonFlags.h" #include "SkSurface.h" #include "SkTLS.h" @@ -39,6 +39,11 @@ void GpuGMTask::draw(GrContextFactory* grFactory) { canvas->concat(fGM->getInitialTransform()); fGM->draw(canvas); canvas->flush(); +#if GR_CACHE_STATS && SK_SUPPORT_GPU + if (FLAGS_veryVerbose) { + grFactory->get(fContextType)->printCacheStats(); + } +#endif SkBitmap bitmap; bitmap.setInfo(info); |