aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/bench_pictures_main.cpp36
-rw-r--r--tools/render_pictures_main.cpp39
2 files changed, 54 insertions, 21 deletions
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index 93b1cf9646..d6837e9079 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -97,7 +97,7 @@ static void usage(const char* argv0) {
SkBenchLogger gLogger;
-static void run_single_benchmark(const SkString& inputPath,
+static bool run_single_benchmark(const SkString& inputPath,
sk_tools::PictureBenchmark& benchmark) {
SkFILEStream inputStream;
@@ -106,11 +106,18 @@ static void run_single_benchmark(const SkString& inputPath,
SkString err;
err.printf("Could not open file %s\n", inputPath.c_str());
gLogger.logError(err);
- return;
+ return false;
}
- SkPicture* picture = SkNEW_ARGS(SkPicture, (&inputStream));
+ bool success = false;
+ SkPicture* picture = SkNEW_ARGS(SkPicture, (&inputStream, &success));
SkAutoTUnref<SkPicture> aur(picture);
+ if (!success) {
+ SkString err;
+ err.printf("Could not read an SkPicture from %s\n", inputPath.c_str());
+ gLogger.logError(err);
+ return false;
+ }
SkString filename;
sk_tools::get_basename(&filename, inputPath);
@@ -124,6 +131,7 @@ static void run_single_benchmark(const SkString& inputPath,
sk_tools::resize_if_needed(&aur);
benchmark.run(aur);
+ return true;
}
static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>* inputs,
@@ -388,19 +396,23 @@ static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>*
gLogger.logProgress(commandLine);
}
-static void process_input(const SkString& input, sk_tools::PictureBenchmark& benchmark) {
+static int process_input(const SkString& input,
+ sk_tools::PictureBenchmark& benchmark) {
SkOSFile::Iter iter(input.c_str(), "skp");
SkString inputFilename;
-
+ int failures = 0;
if (iter.next(&inputFilename)) {
do {
SkString inputPath;
sk_tools::make_filepath(&inputPath, input, inputFilename);
- run_single_benchmark(inputPath, benchmark);
+ if (!run_single_benchmark(inputPath, benchmark))
+ ++failures;
} while(iter.next(&inputFilename));
} else {
- run_single_benchmark(input, benchmark);
+ if (!run_single_benchmark(input, benchmark))
+ ++failures;
}
+ return failures;
}
int main(int argc, char* const argv[]) {
@@ -414,7 +426,15 @@ int main(int argc, char* const argv[]) {
parse_commandline(argc, argv, &inputs, &benchmark);
+ int failures = 0;
for (int i = 0; i < inputs.count(); ++i) {
- process_input(inputs[i], benchmark);
+ failures += process_input(inputs[i], benchmark);
+ }
+
+ if (failures != 0) {
+ SkString err;
+ err.printf("Failed to run %i benchmarks.\n", failures);
+ gLogger.logError(err);
+ return 1;
}
}
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 7d54516d8d..5ad00729dd 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -79,7 +79,7 @@ static void make_output_filepath(SkString* path, const SkString& dir,
path->append("png");
}
-static void write_output(const SkString& outputDir, const SkString& inputFilename,
+static bool write_output(const SkString& outputDir, const SkString& inputFilename,
const sk_tools::PictureRenderer& renderer) {
SkString outputPath;
make_output_filepath(&outputPath, outputDir, inputFilename);
@@ -87,9 +87,10 @@ static void write_output(const SkString& outputDir, const SkString& inputFilenam
if (!isWritten) {
SkDebugf("Could not write to file %s\n", outputPath.c_str());
}
+ return isWritten;
}
-static void render_picture(const SkString& inputPath, const SkString& outputDir,
+static bool render_picture(const SkString& inputPath, const SkString& outputDir,
sk_tools::PictureRenderer& renderer) {
SkString inputFilename;
sk_tools::get_basename(&inputFilename, inputPath);
@@ -98,11 +99,16 @@ static void render_picture(const SkString& inputPath, const SkString& outputDir,
inputStream.setPath(inputPath.c_str());
if (!inputStream.isValid()) {
SkDebugf("Could not open file %s\n", inputPath.c_str());
- return;
+ return false;
}
- SkPicture* picture = SkNEW_ARGS(SkPicture, (&inputStream));
+ bool success = false;
+ SkPicture* picture = SkNEW_ARGS(SkPicture, (&inputStream, &success));
SkAutoTUnref<SkPicture> aur(picture);
+ if (!success) {
+ SkDebugf("Could not read an SkPicture from %s\n", inputPath.c_str());
+ return false;
+ }
SkDebugf("drawing... [%i %i] %s\n", picture->width(), picture->height(),
inputPath.c_str());
@@ -116,26 +122,30 @@ static void render_picture(const SkString& inputPath, const SkString& outputDir,
renderer.resetState();
- write_output(outputDir, inputFilename, renderer);
+ success = write_output(outputDir, inputFilename, renderer);
renderer.end();
+ return success;
}
-static void process_input(const SkString& input, const SkString& outputDir,
+static int process_input(const SkString& input, const SkString& outputDir,
sk_tools::PictureRenderer& renderer) {
SkOSFile::Iter iter(input.c_str(), "skp");
SkString inputFilename;
-
+ int failures = 0;
if (iter.next(&inputFilename)) {
do {
SkString inputPath;
sk_tools::make_filepath(&inputPath, input, inputFilename);
- render_picture(inputPath, outputDir, renderer);
+ if (!render_picture(inputPath, outputDir, renderer))
+ ++failures;
} while(iter.next(&inputFilename));
} else {
SkString inputPath(input);
- render_picture(inputPath, outputDir, renderer);
+ if (!render_picture(inputPath, outputDir, renderer))
+ ++failures;
}
+ return failures;
}
static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>* inputs,
@@ -282,7 +292,7 @@ static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>*
}
int main(int argc, char* const argv[]) {
- SkGraphics::Init();
+ SkAutoGraphics ag;
SkTArray<SkString> inputs;
sk_tools::PictureRenderer* renderer = NULL;
@@ -290,10 +300,14 @@ int main(int argc, char* const argv[]) {
SkString outputDir = inputs[inputs.count() - 1];
SkASSERT(renderer);
+ int failures = 0;
for (int i = 0; i < inputs.count() - 1; i ++) {
- process_input(inputs[i], outputDir, *renderer);
+ failures += process_input(inputs[i], outputDir, *renderer);
+ }
+ if (failures != 0) {
+ SkDebugf("Failed to render %i pictures.\n", failures);
+ return 1;
}
-
#if SK_SUPPORT_GPU
#if GR_CACHE_STATS
if (renderer->isUsingGpuDevice()) {
@@ -305,5 +319,4 @@ int main(int argc, char* const argv[]) {
#endif
SkDELETE(renderer);
- SkGraphics::Term();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 04:43:31 +0000