| Index: src/gpu/SkGr.cpp
|
| diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
|
| index 452218f517b97d5440c6eb967d2f9a22aeda9782..ce484699d7d71181573307ad339fefa74b8ce9b4 100644
|
| --- a/src/gpu/SkGr.cpp
|
| +++ b/src/gpu/SkGr.cpp
|
| @@ -421,13 +421,16 @@ GrTexture* GrUploadMipMapToTexture(GrContext* ctx, const SkImageInfo& info,
|
| GrTexture* GrRefCachedBitmapTexture(GrContext* ctx, const SkBitmap& bitmap,
|
| const GrTextureParams& params,
|
| SkSourceGammaTreatment gammaTreatment) {
|
| - if (bitmap.getTexture()) {
|
| - return GrBitmapTextureAdjuster(&bitmap).refTextureSafeForParams(params, gammaTreatment,
|
| - nullptr);
|
| - }
|
| return GrBitmapTextureMaker(ctx, bitmap).refTextureForParams(params, gammaTreatment);
|
| }
|
|
|
| +sk_sp<GrTexture> GrMakeCachedBitmapTexture(GrContext* ctx, const SkBitmap& bitmap,
|
| + const GrTextureParams& params,
|
| + SkSourceGammaTreatment gammaTreatment) {
|
| + GrTexture* tex = GrBitmapTextureMaker(ctx, bitmap).refTextureForParams(params, gammaTreatment);
|
| + return sk_sp<GrTexture>(tex);
|
| +}
|
| +
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass
|
|
|