Dest color space no longer impacts mipmaps or texture sampling

PS5: Removes SkDestinationSurfaceColorMode, tracking of mipmap
mode on GrTexture, sRGB decode state per-texture. Because we
were often choosing sRGB configs for RGB color types, legacy
rendering would then be incorrect (too dark). So...

PS7: Stops ever using sRGB pixel configs when translating
image info or color type. Also removes a bunch of GrCaps bits
and a GrContextOption that are no longer relevant.

PS9: Adjusts surface creation unit test expectations, and
changes the raster rules accordingly.

At this point, sRGB configs are (obviously) going to be broken.

Locally, I ran 8888, gl, and the gbr- versions of both. Across
all GMs x configs, there are 13 diffs. 12 are GMs that create
surfaces with a color-space attached (and thus, the offscreen
is no longer getting sRGB pixel config). The only remainder
constructs an SkPictureImageGenerator, (with an attached color
space) and renders it to the gbr-gl canvas, which triggers a
a tagged surface inside the generator.

Bug: skia:
Change-Id: Ie5edfa157dd799f3121e8173fc4f97f6c8ed6789
Reviewed-on: https://skia-review.googlesource.com/131282
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

1 files changed, 1 insertions, 10 deletions

diff --git a/src/gpu/GrPaint.h b/src/gpu/GrPaint.h
index c5b45633a7..3a5fa11d03 100644
--- a/src/gpu/GrPaint.h
+++ b/src/gpu/GrPaint.h
@@ -63,19 +63,11 @@ public:
     bool getDisableOutputConversionToSRGB() const { return fDisableOutputConversionToSRGB; }
 
     /**
-     * Should sRGB inputs be allowed to perform sRGB to linear conversion. With this flag
-     * set to false, sRGB textures will be treated as linear (including filtering).
-     */
-    void setAllowSRGBInputs(bool allowSRGBInputs) { fAllowSRGBInputs = allowSRGBInputs; }
-    bool getAllowSRGBInputs() const { return fAllowSRGBInputs; }
-
-    /**
      * Should rendering be gamma-correct, end-to-end. Causes sRGB render targets to behave
-     * as such (with linear blending), and sRGB inputs to be filtered and decoded correctly.
+     * as such (with linear blending).
      */
     void setGammaCorrect(bool gammaCorrect) {
         this->setDisableOutputConversionToSRGB(!gammaCorrect);
-        this->setAllowSRGBInputs(gammaCorrect);
     }
 
     void setXPFactory(const GrXPFactory* xpFactory) {
@@ -155,7 +147,6 @@ private:
     SkSTArray<4, std::unique_ptr<GrFragmentProcessor>> fColorFragmentProcessors;
     SkSTArray<2, std::unique_ptr<GrFragmentProcessor>> fCoverageFragmentProcessors;
     bool fDisableOutputConversionToSRGB = false;
-    bool fAllowSRGBInputs = false;
     bool fTrivial = true;
     GrColor4f fColor = GrColor4f::OpaqueWhite();
 };