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

Fix bracket outside of ifdef

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

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/305333003
This commit is contained in:
krajcevski 2014-06-02 08:02:45 -07:00 committed by Commit bot
parent 0d03db7446
commit 309e869124
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/SkGr.cpp
View File

@ -223,10 +223,11 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx,
bitmap = &tmpBitmap; bitmap = &tmpBitmap;
desc.fConfig = SkImageInfo2GrPixelConfig(bitmap->info()); desc.fConfig = SkImageInfo2GrPixelConfig(bitmap->info());
} }
}
// Is this an ETC1 encoded texture? // Is this an ETC1 encoded texture?
#if SK_SUPPORT_ETC1 #if SK_SUPPORT_ETC1
} else if (cache && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)) { else if (cache && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)) {
GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc); GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc);
if (NULL != texture) { if (NULL != texture) {
return texture; return texture;