diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-07 15:21:18 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-07 15:21:18 +0000 |
| commit | 9a4125283ad56cea3b986337cb669dde14bf0ed8 (patch) | |
| tree | 0ad8f8c8d1eb09df79867d76413e23607dbff264 /gyp | |
| parent | 2d8edaf17510e50261b8a4e2a0daf7e617674999 (diff) | |
Report data from bench_pictures in the same fashion as bench.
Move SkBenchLogger into separate files and make bench_pictures use it.
Remove sk_tools::print_msg, since SkBenchLogger is now used instead.
Combine picture_benchmark with bench_pictures, since that is the
only project that uses it.
Refactor the aggregator for bench timer data into its own class and
make bench_pictures use it.
Consolidate the various virtual PictureBenchmark::run functions
into one for reuse.
BUG=https://code.google.com/p/skia/issues/detail?id=822
Review URL: https://codereview.appspot.com/6488086
git-svn-id: http://skia.googlecode.com/svn/trunk@5432 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gypi | 5 | ||||
| -rw-r--r-- | gyp/tools.gyp | 25 |
2 files changed, 11 insertions, 19 deletions
diff --git a/gyp/bench.gypi b/gyp/bench.gypi index 042ccde6b8..81a00edcb1 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -38,6 +38,11 @@ '../bench/TextBench.cpp', '../bench/VertBench.cpp', '../bench/WriterBench.cpp', + + '../bench/SkBenchLogger.h', + '../bench/SkBenchLogger.cpp', + '../bench/TimerData.h', + '../bench/TimerData.cpp', ], } diff --git a/gyp/tools.gyp b/gyp/tools.gyp index de40dc4de7..45d98c224e 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -85,7 +85,12 @@ 'target_name': 'bench_pictures', 'type': 'executable', 'sources': [ + '../bench/SkBenchLogger.h', + '../bench/SkBenchLogger.cpp', + '../bench/TimerData.h', + '../bench/TimerData.cpp', '../tools/bench_pictures_main.cpp', + '../tools/PictureBenchmark.cpp', ], 'include_dirs': [ '../bench', @@ -95,27 +100,9 @@ 'effects.gyp:effects', 'ports.gyp:ports', 'tools.gyp:picture_utils', - 'tools.gyp:picture_benchmark', - ], - }, - { - 'target_name': 'picture_benchmark', - 'type': 'static_library', - 'sources': [ - '../tools/PictureBenchmark.cpp', - ], - 'include_dirs': [ - '../bench', - ], - 'dependencies': [ - 'core.gyp:core', - 'tools.gyp:picture_utils', 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', - ], - 'export_dependent_settings': [ - 'tools.gyp:picture_renderer', - ] + ], }, { 'target_name': 'picture_renderer', |