diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 14:17:03 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 14:17:03 +0000 |
| commit | 515dcd36032997ce335daa0163c6d67e851bcad1 (patch) | |
| tree | a2f8bf979ed20e575e763d94ddea4cf7e89ce18c /gm | |
| parent | 4d213ab944d96ad60a243ac1ad21c793c1acc80a (diff) | |
Replace uses of GR_DEBUG by SK_DEBUG.
BUG=None
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23137022
git-svn-id: http://skia.googlecode.com/svn/trunk@10978 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gmmain.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index ca266e3f95..ea749a5c71 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -39,6 +39,12 @@ #include "SkTileGridPicture.h" #include "SamplePipeControllers.h" +#ifdef SK_DEBUG +static const bool kDebugOnly = true; +#else +static const bool kDebugOnly = false; +#endif + __SK_FORCE_IMAGE_DECODER_LINKING; #ifdef SK_BUILD_FOR_WIN @@ -1249,12 +1255,12 @@ static const ConfigData gRec[] = { { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNative_GLContextType, 4, kRW_ConfigFlag, "msaa4", false}, /* The gpudebug context does not generate meaningful images, so don't record * the images it generates! We only run it to look for asserts. */ - { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kDebug_GLContextType, 0, kNone_ConfigFlag, "gpudebug", GR_DEBUG}, + { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kDebug_GLContextType, 0, kNone_ConfigFlag, "gpudebug", kDebugOnly}, /* The gpunull context does the least amount of work possible and doesn't generate meaninful images, so don't record them!. It can be run to isolate the CPU-side processing expense from the GPU-side. */ - { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNull_GLContextType, 0, kNone_ConfigFlag, "gpunull", GR_DEBUG}, + { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNull_GLContextType, 0, kNone_ConfigFlag, "gpunull", kDebugOnly}, #if SK_ANGLE { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kANGLE_GLContextType, 0, kRW_ConfigFlag, "angle", true }, { SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kANGLE_GLContextType, 16, kRW_ConfigFlag, "anglemsaa16", true }, |