respect srgb gamma when building mips

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkGr.h"
 #include "SkGrPriv.h"
@@ skipping 327 matching lines @@
         if (texture) {
             return texture;
         }
     }
 
     sk_sp<GrTexture> texture(create_texture_from_yuv(ctx, bitmap, desc));
     if (texture) {
         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;
     }
 
     SkAutoPixmapUnlock srcUnlocker;
     if (!bitmap.requestLock(&srcUnlocker)) {
         return nullptr;
     }
     const SkPixmap& pixmap = srcUnlocker.pixmap();
     // Try to catch where we might have returned nullptr for src crbug.com/492818
     if (nullptr == pixmap.addr()) {
         sk_throw();
     }
 
-    SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, nullptr));
+    SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, gammaTreatment, nullptr));
     if (!mipmaps) {
         return nullptr;
     }
 
     const int mipLevelCount = mipmaps->countLevels() + 1;
     if (mipLevelCount < 1) {
         return nullptr;
     }
 
     const bool isMipMapped = mipLevelCount > 1;
     desc.fIsMipMapped = isMipMapped;
 
     SkAutoTDeleteArray<GrMipLevel> texels(new GrMipLevel[mipLevelCount]);
 
     texels[0].fPixels = pixmap.addr();
     texels[0].fRowBytes = pixmap.rowBytes();
 
     for (int i = 1; i < mipLevelCount; ++i) {
         SkMipMap::Level generatedMipLevel;
         mipmaps->getLevel(i - 1, &generatedMipLevel);
         texels[i].fPixels = generatedMipLevel.fPixmap.addr();
         texels[i].fRowBytes = generatedMipLevel.fPixmap.rowBytes();
     }
 
     return ctx->textureProvider()->createMipMappedTexture(desc, SkBudgeted::kYes, texels.get(),

[Brian Osman, 2016/06/10 13:37:14]

Ganesh is going to think the mips are not gamma-correct, but I can fix that in
the follow-up change. (We need a setter on GrTexture for fMipMapsAreSRGBCorrect,
and we ought to just set that on the result of createMipMappedTexture here,
before returning it).

Save this for a future change, though - I want to switch that boolean member to
SkSourceGammaTreatment while I'm in there.

[reed1, 2016/06/10 14:26:04]

Acknowledged.

                                                           mipLevelCount);
 }
 
 GrTexture* GrUploadMipMapToTexture(GrContext* ctx, const SkImageInfo& info,
                                    const GrMipLevel* texels, int mipLevelCount) {
     const GrCaps* caps = ctx->caps();
     return ctx->textureProvider()->createMipMappedTexture(GrImageInfoToSurfaceDesc(info, *caps),
                                                           SkBudgeted::kYes, texels,
                                                           mipLevelCount);
 }
@@ skipping 362 matching lines @@
             SkErrorInternals::SetError( kInvalidPaint_SkError,
                                         "Sorry, I don't understand the filtering "
                                         "mode you asked for.  Falling back to "
                                         "MIPMaps.");
             textureFilterMode = GrTextureParams::kMipMap_FilterMode;
             break;
 
     }
     return textureFilterMode;
 }