Refactoring in preparation for adding the picture benchmarking program.
Review URL: https://codereview.appspot.com/6339043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4310 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 1935f9d..dcf9b5f 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -23,8 +23,60 @@
'images.gyp:images',
'ports.gyp:ports',
'utils.gyp:utils',
+ 'bench_timer',
],
},
+ {
+ 'target_name' : 'bench_timer',
+ 'type': 'static_library',
+ 'sources': [
+ '../bench/BenchTimer.h',
+ '../bench/BenchTimer.cpp',
+ '../bench/BenchSysTimer_mach.h',
+ '../bench/BenchSysTimer_mach.cpp',
+ '../bench/BenchSysTimer_posix.h',
+ '../bench/BenchSysTimer_posix.cpp',
+ '../bench/BenchSysTimer_windows.h',
+ '../bench/BenchSysTimer_windows.cpp',
+ '../bench/BenchGpuTimer_gl.h',
+ '../bench/BenchGpuTimer_gl.cpp',
+ ],
+ 'include_dirs': [
+ '../src/core',
+ '../src/gpu',
+ ],
+ 'dependencies': [
+ 'core.gyp:core',
+ 'gpu.gyp:gr',
+ ],
+ 'conditions': [
+ [ 'skia_os != "mac"', {
+ 'sources!': [
+ '../bench/BenchSysTimer_mach.h',
+ '../bench/BenchSysTimer_mach.cpp',
+ ],
+ }],
+ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
+ 'sources!': [
+ '../bench/BenchSysTimer_posix.h',
+ '../bench/BenchSysTimer_posix.cpp',
+ ],
+ }],
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
+ 'link_settings': {
+ 'libraries': [
+ '-lrt',
+ ],
+ },
+ }],
+ [ 'skia_os != "win"', {
+ 'sources!': [
+ '../bench/BenchSysTimer_windows.h',
+ '../bench/BenchSysTimer_windows.cpp',
+ ],
+ }],
+ ],
+ }
],
}
diff --git a/gyp/bench.gypi b/gyp/bench.gypi
index 9dd1e11..b11211f 100644
--- a/gyp/bench.gypi
+++ b/gyp/bench.gypi
@@ -3,17 +3,6 @@
{
'sources': [
'../bench/benchmain.cpp',
- '../bench/BenchTimer.h',
- '../bench/BenchTimer.cpp',
- '../bench/BenchSysTimer_mach.h',
- '../bench/BenchSysTimer_mach.cpp',
- '../bench/BenchSysTimer_posix.h',
- '../bench/BenchSysTimer_posix.cpp',
- '../bench/BenchSysTimer_windows.h',
- '../bench/BenchSysTimer_windows.cpp',
- '../bench/BenchGpuTimer_gl.h',
- '../bench/BenchGpuTimer_gl.cpp',
-
'../bench/SkBenchmark.h',
'../bench/SkBenchmark.cpp',
@@ -45,33 +34,6 @@
'../bench/TextBench.cpp',
'../bench/VertBench.cpp',
],
- 'conditions': [
- [ 'skia_os != "mac"', {
- 'sources!': [
- '../bench/BenchSysTimer_mach.h',
- '../bench/BenchSysTimer_mach.cpp',
- ],
- }],
- [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'sources!': [
- '../bench/BenchSysTimer_posix.h',
- '../bench/BenchSysTimer_posix.cpp',
- ],
- }],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
- 'link_settings': {
- 'libraries': [
- '-lrt',
- ],
- },
- }],
- [ 'skia_os != "win"', {
- 'sources!': [
- '../bench/BenchSysTimer_windows.h',
- '../bench/BenchSysTimer_windows.cpp',
- ],
- }],
- ],
}
# Local Variables:
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index a43b811..93eab7d 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -74,6 +74,17 @@
'core.gyp:core',
'images.gyp:images',
'ports.gyp:ports',
+ 'tools.gyp:picture_utils',
+ ],
+ },
+ {
+ 'target_name': 'picture_utils',
+ 'type': 'static_library',
+ 'sources': [
+ '../tools/picture_utils.cpp',
+ ],
+ 'dependencies': [
+ 'core.gyp:core',
],
},
{
@@ -90,7 +101,6 @@
'utils.gyp:utils',
],
},
-
],
}
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 0e7232e..930089b 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -14,6 +14,7 @@
#include "SkPicture.h"
#include "SkStream.h"
#include "SkString.h"
+#include "picture_utils.h"
static void usage(const char* argv0) {
@@ -28,43 +29,15 @@
" outputDir: directory to write the rendered images.\n");
}
-static void make_filepath(SkString* path, const char* dir,
- const SkString& name) {
- size_t len = strlen(dir);
- path->set(dir);
- if (0 < len && '/' != dir[len - 1]) {
- path->append("/");
- }
- path->append(name);
-}
-
-static void open_picture_stream(const char* inputDir,
- const SkString& inputFilename,
- SkFILEStream* inputStream) {
- SkString inputPath;
- make_filepath(&inputPath, inputDir, inputFilename);
- inputStream->setPath(inputPath.c_str());
- if (!inputStream->isValid()) {
- SkDebugf("Could not open file %s\n", inputPath.c_str());
- }
-}
-
static void make_output_filepath(SkString* path, const char* dir,
const SkString& name) {
- make_filepath(path, dir, name);
+ sk_tools::make_filepath(path, dir, name);
path->remove(path->size() - 3, 3);
path->append("png");
}
-static void setup_bitmap(SkPicture& picture, SkBitmap* bitmap) {
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, picture.width(),
- picture.height());
- bitmap->allocPixels();
- bitmap->eraseColor(0);
-}
-
static void generate_image_from_picture(SkPicture& pict, SkBitmap* bitmap) {
- setup_bitmap(pict, bitmap);
+ sk_tools::setup_bitmap(bitmap, pict.width(), pict.height());
SkCanvas canvas(*bitmap);
canvas.drawPicture(pict);
}
@@ -103,7 +76,15 @@
static void render_picture(const char* inputDir, const char* outputDir,
const SkString& inputFilename) {
SkFILEStream inputStream;
- open_picture_stream(inputDir, inputFilename, &inputStream);
+
+ SkString inputPath;
+ sk_tools::make_filepath(&inputPath, inputDir, inputFilename);
+ inputStream.setPath(inputPath.c_str());
+ if (!inputStream.isValid()) {
+ SkDebugf("Could not open file %s\n", inputPath.c_str());
+ return;
+ }
+
SkPicture picture(&inputStream);
SkBitmap bitmap;
generate_image_from_picture(picture, &bitmap);