diff options
| author |  krajcevski <krajcevski@google.com> | 2014-06-02 13:51:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 13:51:34 -0700 |
| commit | 8c111f783f40470e697310244426362132979ad9 (patch) | |
| tree | 5177b93a91ebca50b64f50ca99e3de6cd2073116 /src/gpu/SkGr.cpp | |
| parent | fc435a020ab057bc2e416c733da9296beb4a1a25 (diff) | |
Change #def to be opt-out
R=jvanverth@google.com, robertphillips@google.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/308143008
Diffstat (limited to 'src/gpu/SkGr.cpp')
| -rw-r--r-- | src/gpu/SkGr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 9dc215c735..596e574198 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -15,7 +15,7 @@ #include "GrGpu.h" #include "GrDrawTargetCaps.h" -#if SK_SUPPORT_ETC1 +#ifndef SK_IGNORE_ETC1_SUPPORT # include "etc1.h" #endif @@ -131,7 +131,7 @@ static void add_genID_listener(GrResourceKey key, SkPixelRef* pixelRef) { pixelRef->addGenIDChangeListener(SkNEW_ARGS(GrResourceInvalidator, (key))); } -#if SK_SUPPORT_ETC1 +#ifndef SK_IGNORE_ETC1_SUPPORT static GrTexture *load_etc1_texture(GrContext* ctx, const GrTextureParams* params, const SkBitmap &bm, GrTextureDesc desc) { @@ -173,7 +173,7 @@ static GrTexture *load_etc1_texture(GrContext* ctx, } return result; } -#endif // SK_SUPPORT_ETC1 +#endif // SK_IGNORE_ETC1_SUPPORT static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, bool cache, @@ -226,14 +226,14 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, } // Is this an ETC1 encoded texture? -#if SK_SUPPORT_ETC1 +#ifndef SK_IGNORE_ETC1_SUPPORT else if (cache && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)) { GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc); if (NULL != texture) { return texture; } } -#endif // SK_SUPPORT_ETC1 +#endif // SK_IGNORE_ETC1_SUPPORT SkAutoLockPixels alp(*bitmap); if (!bitmap->readyToDraw()) { |