Gamma-correctness pushed into Skia, top-down.

src/effects/SkGpuBlurUtils.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuBlurUtils.h"
 
 #include "SkRect.h"
@@ skipping 38 matching lines @@
                                  const GrClip& clip,
                                  const SkRect& dstRect,
                                  const SkPoint& srcOffset,
                                  GrTexture* texture,
                                  Gr1DKernelEffect::Direction direction,
                                  int radius,
                                  float sigma,
                                  bool useBounds,
                                  float bounds[2]) {
     GrPaint paint;
+    paint.setAllowSRGBInputs(drawContext->allowSRGBInputs());
     SkAutoTUnref<GrFragmentProcessor> conv(GrConvolutionEffect::CreateGaussian(
         texture, direction, radius, sigma, useBounds, bounds));
     paint.addColorFragmentProcessor(conv);
     paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
     SkMatrix localMatrix = SkMatrix::MakeTrans(-srcOffset.x(), -srcOffset.y());
     drawContext->fillRectWithLocalMatrix(clip, paint, SkMatrix::I(), dstRect, localMatrix);
 }
 
 static void convolve_gaussian_2d(GrDrawContext* drawContext,
                                  const GrClip& clip,
                                  const SkRect& dstRect,
                                  const SkPoint& srcOffset,
                                  GrTexture* texture,
                                  int radiusX,
                                  int radiusY,
                                  SkScalar sigmaX,
                                  SkScalar sigmaY,
                                  const SkRect* srcBounds) {
     SkMatrix localMatrix = SkMatrix::MakeTrans(-srcOffset.x(), -srcOffset.y());
     SkISize size = SkISize::Make(2 * radiusX + 1,  2 * radiusY + 1);
     SkIPoint kernelOffset = SkIPoint::Make(radiusX, radiusY);
     GrPaint paint;
+    paint.setAllowSRGBInputs(drawContext->allowSRGBInputs());
     SkIRect bounds;
     if (srcBounds) {
         srcBounds->roundOut(&bounds);
     } else {
         bounds.setEmpty();
     }
 
     SkAutoTUnref<GrFragmentProcessor> conv(GrMatrixConvolutionEffect::CreateGaussian(
             texture, bounds, size, 1.0, 0.0, kernelOffset,
             srcBounds ? GrTextureDomain::kDecal_Mode : GrTextureDomain::kIgnore_Mode,
@@ skipping 66 matching lines @@
         convolve_gaussian_1d(drawContext, clip, rightRect, srcOffset, texture,
                              direction, radius, sigma, true, bounds);
         convolve_gaussian_1d(drawContext, clip, midRect, srcOffset, texture,
                              direction, radius, sigma, false, bounds);
     }
 }
 
 GrTexture* GaussianBlur(GrContext* context,
                         GrTexture* srcTexture,
                         bool canClobberSrc,
+                        bool allowSRGBInputs,
                         const SkRect& dstBounds,
                         const SkRect* srcBounds,
                         float sigmaX,
                         float sigmaY) {
     SkASSERT(context);
     SkIRect clearRect;
     int scaleFactorX, radiusX;
     int scaleFactorY, radiusY;
     int maxTextureSize = context->caps()->maxTextureSize();
     sigmaX = adjust_sigma(sigmaX, maxTextureSize, &scaleFactorX, &radiusX);
@@ skipping 45 matching lines @@
     }
 
     if (nullptr == dstTexture || nullptr == tempTexture) {
         return nullptr;
     }
 
     SkAutoTUnref<GrDrawContext> srcDrawContext;
 
     for (int i = 1; i < scaleFactorX || i < scaleFactorY; i *= 2) {
         GrPaint paint;
+        paint.setAllowSRGBInputs(allowSRGBInputs);
         SkMatrix matrix;
         matrix.setIDiv(srcTexture->width(), srcTexture->height());
         SkRect dstRect(srcRect);
         if (srcBounds && i == 1) {
             SkRect domain;
             matrix.mapRect(&domain, *srcBounds);
             domain.inset((i < scaleFactorX) ? SK_ScalarHalf / srcTexture->width() : 0.0f,
                          (i < scaleFactorY) ? SK_ScalarHalf / srcTexture->height() : 0.0f);
             SkAutoTUnref<const GrFragmentProcessor> fp(GrTextureDomainEffect::Create(
                 srcTexture,
@@ skipping 19 matching lines @@
         }
         dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
 
         srcDrawContext.swap(dstDrawContext);
         srcRect = dstRect;
         srcTexture = dstTexture;
         SkTSwap(dstTexture, tempTexture);
         localSrcBounds = srcRect;
     }
 
+    SkSurfaceProps props(allowSRGBInputs ? SkSurfaceProps::kAllowSRGBInputs_Flag : 0,
+                         SkSurfaceProps::kLegacyFontHost_InitType);
+
     // For really small blurs (certainly no wider than 5x5 on desktop gpus) it is faster to just
     // launch a single non separable kernel vs two launches
     srcRect = localDstBounds;
     if (sigmaX > 0.0f && sigmaY > 0.0f &&
             (2 * radiusX + 1) * (2 * radiusY + 1) <= MAX_KERNEL_SIZE) {
         // We shouldn't be scaling because this is a small size blur
         SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY));
 
         SkAutoTUnref<GrDrawContext> dstDrawContext(

[robertphillips, 2016/04/05 12:54:34]

I would probably move this move left and put it on 1 line

[Brian Osman, 2016/04/05 15:36:41]

Acknowledged.

-                                             context->drawContext(dstTexture->asRenderTarget()));
+                                             context->drawContext(dstTexture->asRenderTarget(),
+                                                                  &props));
         if (!dstDrawContext) {
             return nullptr;
         }
         convolve_gaussian_2d(dstDrawContext, clip, srcRect, srcOffset,
                              srcTexture, radiusX, radiusY, sigmaX, sigmaY, srcBounds);
 
         srcDrawContext.swap(dstDrawContext);
         srcRect.offsetTo(0, 0);
         srcTexture = dstTexture;
         SkTSwap(dstTexture, tempTexture);
@@ skipping 12 matching lines @@
                     }
                 }
 
                 // Clear out a radius to the right of the srcRect to prevent the
                 // X convolution from reading garbage.
                 clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop,
                                               radiusX, srcIRect.height());
                 srcDrawContext->clear(&clearRect, 0x0, false);
             }
 
             SkAutoTUnref<GrDrawContext> dstDrawContext(

[robertphillips, 2016/04/05 12:54:34]

here too

[Brian Osman, 2016/04/05 15:36:41]

Acknowledged.

-                                             context->drawContext(dstTexture->asRenderTarget()));
+                                             context->drawContext(dstTexture->asRenderTarget(),
+                                                                  &props));
             if (!dstDrawContext) {
                 return nullptr;
             }
             convolve_gaussian(dstDrawContext, clip, srcRect,
                               srcTexture, Gr1DKernelEffect::kX_Direction, radiusX, sigmaX,
                               srcBounds, srcOffset);
             srcDrawContext.swap(dstDrawContext);
             srcTexture = dstTexture;
             srcRect.offsetTo(0, 0);
             SkTSwap(dstTexture, tempTexture);
@@ skipping 11 matching lines @@
                     }
                 }
 
                 // Clear out a radius below the srcRect to prevent the Y
                 // convolution from reading garbage.
                 clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom,
                                               srcIRect.width(), radiusY);
                 srcDrawContext->clear(&clearRect, 0x0, false);
             }
 
             SkAutoTUnref<GrDrawContext> dstDrawContext(

[robertphillips, 2016/04/05 12:54:34]

3

[Brian Osman, 2016/04/05 15:36:41]

Acknowledged.

-                                               context->drawContext(dstTexture->asRenderTarget()));
+                                               context->drawContext(dstTexture->asRenderTarget(),
+                                                                    &props));
             if (!dstDrawContext) {
                 return nullptr;
             }
             convolve_gaussian(dstDrawContext, clip, srcRect,
                               srcTexture, Gr1DKernelEffect::kY_Direction, radiusY, sigmaY,
                               srcBounds, srcOffset);
 
             srcDrawContext.swap(dstDrawContext);
             srcTexture = dstTexture;
             srcRect.offsetTo(0, 0);
@@ skipping 10 matching lines @@
         clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom,
                                       srcIRect.width() + 1, 1);
         srcDrawContext->clear(&clearRect, 0x0, false);
         clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop,
                                       1, srcIRect.height());
         srcDrawContext->clear(&clearRect, 0x0, false);
         SkMatrix matrix;
         matrix.setIDiv(srcTexture->width(), srcTexture->height());
 
         GrPaint paint;
+        paint.setAllowSRGBInputs(allowSRGBInputs);
         // FIXME:  this should be mitchell, not bilinear.
         GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode);
         paint.addColorTextureProcessor(srcTexture, matrix, params);
         paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
 
         SkRect dstRect(srcRect);
         scale_rect(&dstRect, (float) scaleFactorX, (float) scaleFactorY);
 
         SkAutoTUnref<GrDrawContext> dstDrawContext(
                                 context->drawContext(dstTexture->asRenderTarget()));
         if (!dstDrawContext) {
             return nullptr;
         }
         dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
 
         srcDrawContext.swap(dstDrawContext);
         srcRect = dstRect;
         srcTexture = dstTexture;
         SkTSwap(dstTexture, tempTexture);
     }
 
     return SkRef(srcTexture);
 }
 #endif
 
 }