AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Turn serialization back on in GM.

Browse Source 
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
This commit is contained in:
scroggo@google.com 2012-09-14 17:37:46 +00:00
parent d614c6a4e0
commit 39362527e9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gm/gmmain.cpp
View File

@ -775,7 +775,7 @@ static void usage(const char * argv0) {
SkDebugf(gRec[i].fName); SkDebugf(gRec[i].fName);
} }
SkDebugf(" ]\n"); SkDebugf(" ]\n");
SkDebugf(" [--noreplay] [--nopipe] [--serialize] [--forceBWtext] [--nopdf] \n" SkDebugf(" [--noreplay] [--nopipe] [--noserialize] [--forceBWtext] [--nopdf] \n"
" [--tiledPipe] \n" " [--tiledPipe] \n"
" [--nodeferred] [--match substring] [--notexturecache]\n" " [--nodeferred] [--match substring] [--notexturecache]\n"
" [-h|--help]\n" " [-h|--help]\n"
@ -791,7 +791,7 @@ static void usage(const char * argv0) {
SkDebugf(" --nopipe: Skip SkGPipe replay.\n"); SkDebugf(" --nopipe: Skip SkGPipe replay.\n");
SkDebugf(" --tiledPipe: Exercise tiled SkGPipe replay.\n"); SkDebugf(" --tiledPipe: Exercise tiled SkGPipe replay.\n");
SkDebugf( SkDebugf(
" --serialize: exercise SkPicture serialization & deserialization.\n"); " --noserialize: do not exercise SkPicture serialization & deserialization.\n");
SkDebugf(" --forceBWtext: disable text anti-aliasing.\n"); SkDebugf(" --forceBWtext: disable text anti-aliasing.\n");
SkDebugf(" --nopdf: skip the pdf rendering test pass.\n"); SkDebugf(" --nopdf: skip the pdf rendering test pass.\n");
SkDebugf(" --nodeferred: skip the deferred 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 doReplay = true;
bool doPipe = true; bool doPipe = true;
bool doTiledPipe = false; bool doTiledPipe = false;
bool doSerialize = false; bool doSerialize = true;
bool doDeferred = true; bool doDeferred = true;
bool disableTextureCache = false; bool disableTextureCache = false;
SkTDArray<size_t> configs; SkTDArray<size_t> configs;
@ -941,7 +941,11 @@ int main(int argc, char * const argv[]) {
} else if (strcmp(*argv, "--enable-missing-warning") == 0) { } else if (strcmp(*argv, "--enable-missing-warning") == 0) {
gNotifyMissingReadReference = true; gNotifyMissingReadReference = true;
} else if (strcmp(*argv, "--serialize") == 0) { } 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; doSerialize = true;
} else if (strcmp(*argv, "--noserialize") == 0) {
doSerialize = false;
} else if (strcmp(*argv, "--match") == 0) { } else if (strcmp(*argv, "--match") == 0) {
++argv; ++argv;
if (argv < stop && **argv) { if (argv < stop && **argv) {