aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/SkGr.cpp
diff options
context:
space:
mode:
authorGravatar krajcevski <krajcevski@google.com>2014-06-02 08:02:45 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-02 08:02:45 -0700
commit309e86912445879651d52ebbedb67b4ff3f1516c (patch)
tree9abd1e21a678e23c10b9ceeef13e9e80c3f76bca /src/gpu/SkGr.cpp
parent0d03db7446126be6ccce744be9b37ef475142e16 (diff)
Fix bracket outside of ifdef
R=jvanverth@google.com, robertphillips@google.com Author: krajcevski@google.com Review URL: https://codereview.chromium.org/305333003
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r--src/gpu/SkGr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 9579866269..9dc215c735 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -223,10 +223,11 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx,
bitmap = &tmpBitmap;
desc.fConfig = SkImageInfo2GrPixelConfig(bitmap->info());
}
+ }
// Is this an ETC1 encoded texture?
#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);
if (NULL != texture) {
return texture;