diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 19:09:29 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 19:09:29 +0000 |
| commit | 11e10e340b98b57c4c7d9d39539ee546b953e74a (patch) | |
| tree | a6a1cbc123883d5bfab21ba55bf0ca4c34c06a44 | |
| parent | 614cbeef4739ed4520290de374468b1a7eba3306 (diff) | |
Patch for Windows compilation errors from r12916
git-svn-id: http://skia.googlecode.com/svn/trunk@12919 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | tools/PictureRenderingFlags.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tools/PictureRenderingFlags.cpp b/tools/PictureRenderingFlags.cpp index e1cc72fe85..7d34e27491 100644 --- a/tools/PictureRenderingFlags.cpp +++ b/tools/PictureRenderingFlags.cpp @@ -23,19 +23,28 @@ DEFINE_string(bbh, "none", "bbhType [width height]: Set the bounding box hierarc "'grid', width and height must be specified. 'grid' can " "only be used with modes tile, record, and " "playbackCreation."); -// Although this config does not support all the same options as gm, the names should be kept -// consistent. -DEFINE_string(config, "8888", "[" - "8888" + + #if SK_SUPPORT_GPU - "|gpu|msaa4|msaa16" +#define GPU_CONFIG_STRING "|gpu|msaa4|msaa16" +#else +#define GPU_CONFIG_STRING "" #endif #if SK_ANGLE - "|angle" +#define ANGLE_CONFIG_STRING "|angle" +#else +#define ANGLE_CONFIG_STRING "" #endif #if SK_MESA - "|mesa" +#define MESA_CONFIG_STRING "|mesa" +#else +#define MESA_CONFIG_STRING "" #endif + +// Although this config does not support all the same options as gm, the names should be kept +// consistent. +DEFINE_string(config, "8888", "[" + "8888" GPU_CONFIG_STRING ANGLE_CONFIG_STRING MESA_CONFIG_STRING "]: Use the corresponding config."); DEFINE_bool(deferImageDecoding, false, "Defer decoding until drawing images. " |