diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-14 17:37:46 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-14 17:37:46 +0000 |
| commit | 39362527e955948aa3325d91d00bd83df74cbe00 (patch) | |
| tree | f6258300c80dcc72dc4a72d965cce1b1f6bd46e3 /gm | |
| parent | d614c6a4e059bd9ea5b882ca845e886a82aeff5c (diff) | |
Turn serialization back on in GM.
With https://codereview.appspot.com/6503106/ it is now safe to do
serialization by default.
Review URL: https://codereview.appspot.com/6498121
git-svn-id: http://skia.googlecode.com/svn/trunk@5551 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gmmain.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index f13d99fd0a..c4ed298efa 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -775,7 +775,7 @@ static void usage(const char * argv0) { SkDebugf(gRec[i].fName); } SkDebugf(" ]\n"); - SkDebugf(" [--noreplay] [--nopipe] [--serialize] [--forceBWtext] [--nopdf] \n" + SkDebugf(" [--noreplay] [--nopipe] [--noserialize] [--forceBWtext] [--nopdf] \n" " [--tiledPipe] \n" " [--nodeferred] [--match substring] [--notexturecache]\n" " [-h|--help]\n" @@ -791,7 +791,7 @@ static void usage(const char * argv0) { SkDebugf(" --nopipe: Skip SkGPipe replay.\n"); SkDebugf(" --tiledPipe: Exercise tiled SkGPipe replay.\n"); SkDebugf( - " --serialize: exercise SkPicture serialization & deserialization.\n"); + " --noserialize: do not exercise SkPicture serialization & deserialization.\n"); SkDebugf(" --forceBWtext: disable text anti-aliasing.\n"); SkDebugf(" --nopdf: skip the pdf rendering test pass.\n"); SkDebugf(" --nodeferred: skip the deferred rendering test pass.\n"); @@ -888,7 +888,7 @@ int main(int argc, char * const argv[]) { bool doReplay = true; bool doPipe = true; bool doTiledPipe = false; - bool doSerialize = false; + bool doSerialize = true; bool doDeferred = true; bool disableTextureCache = false; SkTDArray<size_t> configs; @@ -941,7 +941,11 @@ int main(int argc, char * const argv[]) { } else if (strcmp(*argv, "--enable-missing-warning") == 0) { gNotifyMissingReadReference = true; } else if (strcmp(*argv, "--serialize") == 0) { + // Leaving in this option so that a user need not modify their command line arguments + // to still run. doSerialize = true; + } else if (strcmp(*argv, "--noserialize") == 0) { + doSerialize = false; } else if (strcmp(*argv, "--match") == 0) { ++argv; if (argv < stop && **argv) { |