Gamma-correctness pushed into Skia, top-down.

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 45 matching lines @@
     void setAntiAlias(bool aa) { fAntiAlias = aa; }
     bool isAntiAlias() const { return fAntiAlias; }
 
     /**
      * Should shader output conversion from linear to sRGB be disabled.
      * Only relevant if the destination is sRGB. Defaults to false.
      */
     void setDisableOutputConversionToSRGB(bool srgb) { fDisableOutputConversionToSRGB = srgb; }
     bool getDisableOutputConversionToSRGB() const { return fDisableOutputConversionToSRGB; }
 
+    /**

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

Expand on this a bit?

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

Acknowledged.

+     * Should sRGB inputs be allowed to perform sRGB to linear conversion.
+     */
+    void setAllowSRGBInputs(bool allowSRGBInputs) { fAllowSRGBInputs = allowSRGBInputs; }
+    bool getAllowSRGBInputs() const { return fAllowSRGBInputs; }
+
     const GrXPFactory* setXPFactory(const GrXPFactory* xpFactory) {
         fXPFactory.reset(SkSafeRef(xpFactory));
         return xpFactory;
     }
 
     void setPorterDuffXPFactory(SkXfermode::Mode mode) {
         fXPFactory.reset(GrPorterDuffXPFactory::Create(mode));
     }
 
     void setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage = false); 
@@ skipping 37 matching lines @@
     const GrFragmentProcessor* getColorFragmentProcessor(int i) const {
         return fColorFragmentProcessors[i];
     }
     const GrFragmentProcessor* getCoverageFragmentProcessor(int i) const {
         return fCoverageFragmentProcessors[i];
     }
 
     GrPaint& operator=(const GrPaint& paint) {
         fAntiAlias = paint.fAntiAlias;
         fDisableOutputConversionToSRGB = paint.fDisableOutputConversionToSRGB;
+        fAllowSRGBInputs = paint.fAllowSRGBInputs;
 
         fColor = paint.fColor;
         this->resetFragmentProcessors();
         fColorFragmentProcessors = paint.fColorFragmentProcessors;
         fCoverageFragmentProcessors = paint.fCoverageFragmentProcessors;
         for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
             fColorFragmentProcessors[i]->ref();
         }
         for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
             fCoverageFragmentProcessors[i]->ref();
@@ skipping 23 matching lines @@
         fColorFragmentProcessors.reset();
         fCoverageFragmentProcessors.reset();
     }
 
     mutable SkAutoTUnref<const GrXPFactory>         fXPFactory;
     SkSTArray<4, const GrFragmentProcessor*, true>  fColorFragmentProcessors;
     SkSTArray<2, const GrFragmentProcessor*, true>  fCoverageFragmentProcessors;
 
     bool                                            fAntiAlias;
     bool                                            fDisableOutputConversionToSRGB;
+    bool                                            fAllowSRGBInputs;
 
     GrColor                                         fColor;
 };
 
 #endif