Chromium Code Reviews| Index: src/gpu/SkGr.cpp |
| diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp |
| index 31372cd02a1816cf378ecae4f71070465983955d..ccdf80a799412a387058baf5ac570200f95701cd 100644 |
| --- a/src/gpu/SkGr.cpp |
| +++ b/src/gpu/SkGr.cpp |
| @@ -244,7 +244,9 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, |
| // Is this an ETC1 encoded texture? |
| #ifndef SK_IGNORE_ETC1_SUPPORT |
| - else if (cache && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)) { |
| + else if (cache |
| + && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig) |
|
robertphillips
2014/06/04 18:53:36
What is this fixing?
krajcevski
2014/06/04 19:26:53
If the bitmap had compressed data and was then unc
robertphillips
2014/06/04 19:46:37
That needs a comment!
krajcevski
2014/06/04 19:57:16
Done.
|
| + && !(bitmap->readyToDraw())) { |
| GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc); |
| if (NULL != texture) { |
| return texture; |