Replace edge types with GrEdgeEffect.

src/gpu/gl/GrGLProgram.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 GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
@@ skipping 147 matching lines @@
         // secondary source is output and what value it holds.
         enum DualSrcOutput {
             kNone_DualSrcOutput,
             kCoverage_DualSrcOutput,
             kCoverageISA_DualSrcOutput,
             kCoverageISC_DualSrcOutput,
 
             kDualSrcOutputCnt
         };
 
-        // TODO: remove these two members when edge-aa can be rewritten as a GrEffect.
-        GrDrawState::VertexEdgeType fVertexEdgeType;
         // should the FS discard if the edge-aa coverage is zero (to avoid stencil manipulation)
         bool                        fDiscardIfOutsideEdge;
 
         // stripped of bits that don't affect program generation
         GrAttribBindings            fAttribBindings;
 
         /** Non-zero if this stage has an effect */
         GrGLEffect::EffectKey       fEffectKeys[GrDrawState::kNumStages];
 
         // To enable experimental geometry shader code (not for use in
         // production)
 #if GR_GL_EXPERIMENTAL_GS
         bool                        fExperimentalGS;
 #endif
         uint8_t                     fColorInput;            // casts to enum ColorInput
         uint8_t                     fCoverageInput;         // casts to enum ColorInput
         uint8_t                     fDualSrcOutput;         // casts to enum DualSrcOutput
         int8_t                      fFirstCoverageStage;
         SkBool8                     fEmitsPointSize;
         uint8_t                     fColorFilterXfermode;   // casts to enum SkXfermode::Mode
 
         int8_t                      fPositionAttributeIndex;
         int8_t                      fColorAttributeIndex;
         int8_t                      fCoverageAttributeIndex;
-        int8_t                      fEdgeAttributeIndex;
         int8_t                      fLocalCoordsAttributeIndex;
 
         friend class GrGLProgram;
     };
 
     // Layout information for OpenGL vertex attributes
     struct AttribLayout {
         GrGLint     fCount;
         GrGLenum    fType;
         GrGLboolean fNormalized;
@@ skipping 13 matching lines @@
     bool genProgram(const GrEffectStage* stages[]);
 
     void genInputColor(GrGLShaderBuilder* builder, SkString* inColor);
 
     void genGeometryShader(GrGLShaderBuilder* segments) const;
 
     typedef GrGLUniformManager::UniformHandle UniformHandle;
 
     void genUniformCoverage(GrGLShaderBuilder* segments, SkString* inOutCoverage);
 
-    // generates code to compute coverage based on edge AA. Returns true if edge coverage was
-    // inserted in which case coverageVar will be updated to refer to a scalar. Otherwise,
-    // coverageVar is set to an empty string.
-    bool genEdgeCoverage(SkString* coverageVar, GrGLShaderBuilder* builder) const;
-
     // Creates a GL program ID, binds shader attributes to GL vertex attrs, and links the program
     bool bindOutputsAttribsAndLinkProgram(const GrGLShaderBuilder& builder,
                                           bool bindColorOut,
                                           bool bindDualSrcOut);
 
     // Sets the texture units for samplers
     void initSamplerUniforms();
 
     bool compileShaders(const GrGLShaderBuilder& builder);
 
@@ skipping 49 matching lines @@
     Desc                        fDesc;
     const GrGLContext&          fContext;
 
     GrGLUniformManager          fUniformManager;
     UniformHandles              fUniformHandles;
 
     typedef GrRefCnt INHERITED;
 };
 
 #endif