| Index: src/gpu/SkGr.cpp
|
| diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
|
| index ca7d6b8e84f253b8e81f9cfefbd484f5acab5079..cf50f6004edd6323909a761f5d5684ed6cdc1f2a 100644
|
| --- a/src/gpu/SkGr.cpp
|
| +++ b/src/gpu/SkGr.cpp
|
| @@ -345,12 +345,6 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b
|
| return texture.release();
|
| }
|
|
|
| - // SkMipMap::Build doesn't handle sRGB data correctly (yet).
|
| - // Failover to the GL code-path for now.
|
| - if (kLinear_SkColorProfileType != bitmap.profileType()) {
|
| - return nullptr;
|
| - }
|
| -
|
| SkASSERT(sizeof(int) <= sizeof(uint32_t));
|
| if (bitmap.width() < 0 || bitmap.height() < 0) {
|
| return nullptr;
|
| @@ -366,7 +360,7 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b
|
| sk_throw();
|
| }
|
|
|
| - SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, nullptr));
|
| + SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, gammaTreatment, nullptr));
|
| if (!mipmaps) {
|
| return nullptr;
|
| }
|
|
|