| Index: src/core/SkImageCacherator.cpp
|
| diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp
|
| index 12c09cbe0ae7107658350379635c5881eea9a010..bb389e986b4e4d831ddd5d66bead22324729b824 100644
|
| --- a/src/core/SkImageCacherator.cpp
|
| +++ b/src/core/SkImageCacherator.cpp
|
| @@ -171,7 +171,8 @@ bool SkImageCacherator::lockAsBitmap(SkBitmap* bitmap, const SkImage* client,
|
| }
|
|
|
| const uint32_t pixelOpsFlags = 0;
|
| - if (!tex->readPixels(0, 0, bitmap->width(), bitmap->height(), SkImageInfo2GrPixelConfig(fInfo),
|
| + if (!tex->readPixels(0, 0, bitmap->width(), bitmap->height(),
|
| + SkImageInfo2GrPixelConfig(fInfo, *tex->getContext()->caps()),
|
| bitmap->getPixels(), bitmap->rowBytes(), pixelOpsFlags)) {
|
| bitmap->reset();
|
| return false;
|
| @@ -273,7 +274,7 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key
|
| }
|
| }
|
|
|
| - const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo);
|
| + const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo, *ctx->caps());
|
|
|
| // 3. Ask the generator to return a compressed form that the GPU might support
|
| SkAutoTUnref<SkData> data(this->refEncoded(ctx));
|
|
|