Replace fWillReadFragmentPosition with a bitfield

src/gpu/GrProcOptInfo.h

Index: src/gpu/GrProcOptInfo.h
diff --git a/src/gpu/GrProcOptInfo.h b/src/gpu/GrProcOptInfo.h
index 19f01a2821659b2131fb3b9f43ee46a32ad1025d..181db385bee3d5758e9a4a7575fb42b07c9f8e18 100644
--- a/src/gpu/GrProcOptInfo.h
+++ b/src/gpu/GrProcOptInfo.h
@@ -10,11 +10,11 @@
 
 #include "GrColor.h"
 #include "GrInvariantOutput.h"
+#include "GrProcessor.h"
 
 class GrDrawBatch;
 class GrFragmentProcessor;
 class GrPrimitiveProcessor;
-class GrProcessor;
 
 /**
  * GrProcOptInfo gathers invariant data from a set of processor stages.It is used to recognize
@@ -28,7 +28,7 @@ public:
         , fFirstEffectiveProcessorIndex(0)
         , fInputColorIsUsed(true)
         , fInputColor(0)
-        , fReadsFragPosition(false) {}
+        , fBuiltInState(GrProcessor::kNone_BuiltInState) {}
 
     void calcWithInitialValues(const GrFragmentProcessor* const *, int cnt, GrColor startColor,
                                GrColorComponentFlags, bool areCoverageStages, bool isLCD = false);
@@ -76,18 +76,18 @@ public:
     GrColor inputColorToFirstEffectiveProccesor() const { return fInputColor; }
 
     /**
-     * Returns true if any of the processor preserved by GrProcOptInfo read the frag position.
+     * Returns the set of built-in state used by the processors preserved by GrProcOptInfo.
      */
-    bool readsFragPosition() const { return fReadsFragPosition; }
+    GrProcessor::BuiltInState builtInState() const { return fBuiltInState; }
 
 private:
-    void internalCalc(const GrFragmentProcessor* const[], int cnt, bool initWillReadFragPosition);
+    void internalCalc(const GrFragmentProcessor* const[], int cnt);
 
     GrInvariantOutput fInOut;
     int fFirstEffectiveProcessorIndex;
     bool fInputColorIsUsed;
     GrColor fInputColor;
-    bool fReadsFragPosition;
+    GrProcessor::BuiltInState fBuiltInState;
 };
 
 #endif