Move srgb enable flags to GrProcessorSet from pipelinebuilder

BUG=skia:

Change-Id: I533d032a8019980b3870d432ada59bac805d7c36
Reviewed-on: https://skia-review.googlesource.com/7268
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index e56330025f..3949a75c5c 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -83,16 +83,6 @@ public:
          * Modifies the vertex shader so that vertices will be positioned at pixel centers.
          */
         kSnapVerticesToPixelCenters_Flag = 0x2,
-
-        /**
-         * Suppress linear -> sRGB conversion when rendering to sRGB render targets.
-         */
-        kDisableOutputConversionToSRGB_Flag = 0x4,
-
-        /**
-         * Allow sRGB -> linear conversion when reading from sRGB inputs.
-         */
-        kAllowSRGBInputs_Flag = 0x8,
     };
 
     struct CreateArgs {
@@ -231,7 +221,10 @@ public:
 private:
     GrPipeline() { /** Initialized in factory function*/ }
 
+    /** This is a continuation of the public "Flags" enum. */
     enum PrivateFlags {
+        kDisableOutputConversionToSRGB_Flag = 0x4,
+        kAllowSRGBInputs_Flag = 0x8,
         kUsesDistanceVectorField_Flag = 0x10,
         kHasStencilClip_Flag = 0x20,
         kStencilEnabled_Flag = 0x40,