Add GrEllipseEdgeEffect

src/gpu/GrDrawState.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 GrDrawState_DEFINED
 #define GrDrawState_DEFINED
 
@@ skipping 470 matching lines @@
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Effect Stages
     ////
 
     const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect) {
         fStages[stageIdx].setEffect(effect);
         return effect;
     }
 
+    const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect, const int indices[]) {
+        fStages[stageIdx].setEffect(effect);

[bsalomon, 2013/03/07 15:59:13]

Any reason not to move this code to StageEffect::setEffect?

[jvanverth1, 2013/03/07 22:00:44]

Done.

+        int numVertexAttribs = (effect == NULL) ? 0 : effect->get()->numVertexAttribs();
+        fStages[stageIdx].setVertexAttribIndices(indices, numVertexAttribs);
+        return effect;
+    }
+
     /**
      * Creates a GrSimpleTextureEffect.
      */
     void createTextureEffect(int stageIdx, GrTexture* texture, const SkMatrix& matrix) {
         GrAssert(!this->getStage(stageIdx).getEffect());
         GrEffectRef* effect = GrSimpleTextureEffect::Create(texture, matrix);
         this->setEffect(stageIdx, effect)->unref();
     }
     void createTextureEffect(int stageIdx,
                              GrTexture* texture,
                              const SkMatrix& matrix,
                              const GrTextureParams& params) {
         GrAssert(!this->getStage(stageIdx).getEffect());
         GrEffectRef* effect = GrSimpleTextureEffect::Create(texture, matrix, params);
         this->setEffect(stageIdx, effect)->unref();
     }
 
     bool stagesDisabled() {
         for (int i = 0; i < kNumStages; ++i) {
             if (NULL != fStages[i].getEffect()) {
                 return false;
             }
         }
         return true;
     }
 
-    void disableStage(int stageIdx) { this->setEffect(stageIdx, NULL); }
+    void disableStage(int stageIdx) { 
+        this->setEffect(stageIdx, NULL, NULL); 
+    }
 
     /**
      * Release all the GrEffects referred to by this draw state.
      */
     void disableStages() {
         for (int i = 0; i < kNumStages; ++i) {
             this->disableStage(i);
         }
     }
 
@@ skipping 486 matching lines @@
            components used). Coverage based on signed distance with negative
            being inside, positive outside. Edge specified in window space
            (y-down) */
         kQuad_EdgeType,
         /* Same as above but for hairline quadratics. Uses unsigned distance.
            Coverage is min(0, 1-distance). */
         kHairQuad_EdgeType,
         /* Circle specified as center_x, center_y, outer_radius, inner_radius
            all in window space (y-down). */
         kCircle_EdgeType,
-        /* Axis-aligned ellipse specified as center_x, center_y, x_radius, x_radius/y_radius
-           all in window space (y-down). */
-        kEllipse_EdgeType,
 
         kVertexEdgeTypeCnt
     };
 
     /**
      * Determines the interpretation per-vertex edge data when the
      * kEdge_AttribBindingsBit is set (see GrDrawTarget). When per-vertex edges
      * are not specified the value of this setting has no effect.
      */
     void setVertexEdgeType(VertexEdgeType type) {
@@ skipping 333 matching lines @@
     int                                    fAttribIndices[kAttribIndexCount];
     GrVertexAttribArray<kVertexAttribCnt>  fVertexAttribs;
     GrEffectStage                          fStages[kNumStages];
 
     typedef GrRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
 
 #endif