From 9a4125283ad56cea3b986337cb669dde14bf0ed8 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 7 Sep 2012 15:21:18 +0000 Subject: 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 --- gyp/tools.gyp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gyp/tools.gyp') 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', -- cgit v1.2.3