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

Change #def to be opt-out

Browse Source 
R=jvanverth@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/308143008
This commit is contained in:
krajcevski 2014-06-02 13:51:34 -07:00 committed by Commit bot
parent fc435a020a
commit 8c111f783f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/common_conditions.gypi
View File

@ -6,7 +6,6 @@
'SK_SUPPORT_GPU=<(skia_gpu)',
'SK_SUPPORT_OPENCL=<(skia_opencl)',
'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
'SK_SUPPORT_ETC1'
],
'conditions' : [
[ 'skia_arch_type == "arm64"', {
@ -320,6 +319,7 @@
'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
'SK_IGNORE_ETC1_SUPPORT',
# Defines from skia_for_android_framework_defines.gypi
'<@(skia_for_android_framework_defines)',
],

1
gyp/skia_for_chromium_defines.gypi
View File

@ -21,6 +21,7 @@
'SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE',
'SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS',
'SK_SUPPORT_LEGACY_IMAGEGENERATORAPI',
'SK_IGNORE_ETC1_SUPPORT',
],
},
}

10
src/gpu/SkGr.cpp
View File

@ -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()) {