Gamma-correctness pushed into Skia, top-down.

src/gpu/GrDrawContext.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchTest.h"
 #include "GrColor.h"
 #include "GrDrawContext.h"
@@ skipping 368 matching lines @@
                                            const SkMatrix& viewMatrix,
                                            const SkRect& rect) {
     ASSERT_SINGLE_OWNER_PRIV
     RETURN_FALSE_IF_ABANDONED_PRIV
     SkDEBUGCODE(fDrawContext->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContext::stencilRect");
 
     AutoCheckFlush acf(fDrawContext->fDrawingManager);
 
     GrPaint paint;
+    // SRGBTODO: AllowSRGBInputs?

[bsalomon, 2016/04/05 13:24:01]

Shouldn't matter. This is used to draw clip masks and there will never be
anything in the color pipeline.

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

Acknowledged.

     paint.setAntiAlias(doAA);
     paint.setCoverageSetOpXPFactory(op, invert);
 
     SkAutoTUnref<GrDrawBatch> batch(fDrawContext->getFillRectBatch(paint, viewMatrix, rect));
     if (batch) {
         GrPipelineBuilder pipelineBuilder(paint, fDrawContext->fRenderTarget, GrClip::WideOpen());
         pipelineBuilder.setStencil(ss);
 
         fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, batch, scissorRect);
         return true;
@@ skipping 495 matching lines @@
     canDrawArgs.fIsStencilDisabled = isStencilDisabled;
     canDrawArgs.fIsStencilBufferMSAA = isStencilBufferMSAA;
 
     // Don't allow the SW renderer
     GrPathRenderer* pr = fDrawContext->fDrawingManager->getPathRenderer(canDrawArgs, false, type);
     if (!pr) {
         return false;
     }
 
     GrPaint paint;
+    // SRGBTODO: AllowSRGBInputs?

[bsalomon, 2016/04/05 13:24:01]

Also drawing clip masks here.

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

Acknowledged.

     paint.setCoverageSetOpXPFactory(op, invert);
 
     // TODO: it is unfortunate that we have to convert this to a GrClip to
     // call drawPath.
     GrClip clip;
     if (scissorRect) {
         clip.setIRect(*scissorRect);
     }
 
     GrPipelineBuilder pipelineBuilder(paint, fDrawContext->fRenderTarget, clip);
@@ skipping 115 matching lines @@
 }
 
 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* batch) {
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::drawBatch");
 
     this->getDrawTarget()->drawBatch(*pipelineBuilder, batch);
 }