reverting to 3437
git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 61095e1..6f53ce8 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -589,9 +589,9 @@
static void usage(const char * argv0) {
SkDebugf(
- "%s [-w writePath] [-r readPath] [-d diffPath] [-i resourcePath]\n"
- " [--noreplay] [--serialize] [--forceBWtext] [--nopdf] \n"
- " [--nodeferred] [--match substring] [--notexturecache]"
+ "%s [-w writePath] [-r readPath] [-d diffPath] [--noreplay]\n"
+ " [--serialize] [--forceBWtext] [--nopdf] [--nodeferred]\n"
+ " [--match substring] [--notexturecache]"
#if SK_MESA
" [--mesagl]"
#endif
@@ -601,7 +601,6 @@
" readPath: directory to read reference images from;\n"
" reports if any pixels mismatch between reference and new images\n");
SkDebugf(" diffPath: directory to write difference images in.\n");
- SkDebugf(" resourcePath: directory that stores image resources.\n");
SkDebugf(" --noreplay: do not exercise SkPicture replay.\n");
SkDebugf(
" --serialize: exercise SkPicture serialization & deserialization.\n");
@@ -661,7 +660,6 @@
const char* writePath = NULL; // if non-null, where we write the originals
const char* readPath = NULL; // if non-null, were we read from to compare
const char* diffPath = NULL; // if non-null, where we write our diffs (from compare)
- const char* resourcePath = NULL;// if non-null, where we read from for image resources
SkTDArray<const char*> fMatches;
@@ -690,11 +688,6 @@
if (argv < stop && **argv) {
diffPath = *argv;
}
- } else if (strcmp(*argv, "-i") == 0) {
- argv++;
- if (argv < stop && **argv) {
- resourcePath = *argv;
- }
} else if (strcmp(*argv, "--forceBWtext") == 0) {
gForceBWtext = true;
} else if (strcmp(*argv, "--noreplay") == 0) {
@@ -716,19 +709,17 @@
useMesa = true;
#endif
} else if (strcmp(*argv, "--notexturecache") == 0) {
- disableTextureCache = true;
+ disableTextureCache = true;
} else {
- usage(commandName);
- return -1;
+ usage(commandName);
+ return -1;
}
}
if (argv != stop) {
- usage(commandName);
- return -1;
+ usage(commandName);
+ return -1;
}
- GM::SetResourcePath(resourcePath);
-
int maxW = -1;
int maxH = -1;
Iter iter;
@@ -772,10 +763,6 @@
fprintf(stderr, "writing to %s\n", writePath);
}
- if (resourcePath) {
- fprintf(stderr, "reading resources from %s\n", resourcePath);
- }
-
// Accumulate success of all tests.
int testsRun = 0;
int testsPassed = 0;
@@ -841,10 +828,10 @@
if (doDeferred && !testErrors &&
(kGPU_Backend == gRec[i].fBackend ||
- kRaster_Backend == gRec[i].fBackend)) {
+ kRaster_Backend == gRec[i].fBackend)) {
testErrors |= test_deferred_drawing(gm, gRec[i],
- forwardRenderedBitmap,
- diffPath, gGrContext, rt.get());
+ forwardRenderedBitmap,
+ diffPath, gGrContext, rt.get());
}
if ((ERROR_NONE == testErrors) && doReplay &&