Replace fWillReadFragmentPosition with a bitfield

src/gpu/glsl/GrGLSLFragmentShaderBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSLFragmentShaderBuilder_DEFINED
 #define GrGLSLFragmentShaderBuilder_DEFINED
 
 #include "GrGLSLShaderBuilder.h"
 
+#include "GrProcessor.h"
 #include "glsl/GrGLSLProcessorTypes.h"
 
 class GrRenderTarget;
 class GrGLSLVarying;
 
 /*
  * This base class encapsulates the common functionality which all processors use to build fragment
  * shaders.
  */
 class GrGLSLFragmentBuilder : public GrGLSLShaderBuilder {
@@ skipping 141 matching lines @@
     const char* dstColor() override;
     void enableAdvancedBlendEquationIfNeeded(GrBlendEquation) override;
 
 private:
     // Private public interface, used by GrGLProgramBuilder to build a fragment shader
     void enableCustomOutput();
     void enableSecondaryOutput();
     const char* getPrimaryColorOutputName() const;
     const char* getSecondaryColorOutputName() const;
 
+#ifdef SK_DEBUG
     // As GLSLProcessors emit code, there are some conditions we need to verify.  We use the below
     // state to track this.  The reset call is called per processor emitted.
+    bool usedBuiltInState() const { return fUsedBuiltInState; }
     bool hasReadDstColor() const { return fHasReadDstColor; }
-    bool hasReadFragmentPosition() const { return fHasReadFragmentPosition; }
-    void reset() {
+    void resetVerification() {
+        fUsedBuiltInState = GrProcessor::kNone_BuiltInState;
         fHasReadDstColor = false;
-        fHasReadFragmentPosition = false;
     }
+#endif
 
     static const char* DeclaredColorOutputName() { return "fsColorOut"; }
     static const char* DeclaredSecondaryColorOutputName() { return "fsSecondaryColorOut"; }
 
     /*
      * An internal call for GrGLProgramBuilder to use to add varyings to the vertex shader
      */
     void addVarying(GrGLSLVarying*, GrSLPrecision);
 
     void onFinalize() override;
@@ skipping 27 matching lines @@
      */
     SkString fMangleString;
 
     bool fSetupFragPosition;
     bool fTopLeftFragPosRead;
     bool fHasCustomColorOutput;
     int  fCustomColorOutputIndex;
     bool fHasSecondaryOutput;
     bool fHasInitializedSampleMask;
 
+#ifdef SK_DEBUG
     // some state to verify shaders and effects are consistent, this is reset between effects by
     // the program creator
+    GrProcessor::BuiltInState fUsedBuiltInState;
     bool fHasReadDstColor;
-    bool fHasReadFragmentPosition;
+#endif
 
     friend class GrGLSLProgramBuilder;
     friend class GrGLProgramBuilder;
 };
 
 #endif