| Index: src/gpu/GrDrawState.h
|
| ===================================================================
|
| --- src/gpu/GrDrawState.h (revision 7952)
|
| +++ src/gpu/GrDrawState.h (working copy)
|
| @@ -488,6 +488,10 @@
|
| return effect;
|
| }
|
|
|
| + void setEffectAttribIndices(int stageIdx, const int indices[], int count) {
|
| + fStages[stageIdx].setVertexAttribIndices(indices, count);
|
| + }
|
| +
|
| /**
|
| * Creates a GrSimpleTextureEffect.
|
| */
|
| @@ -514,7 +518,10 @@
|
| return true;
|
| }
|
|
|
| - void disableStage(int stageIdx) { this->setEffect(stageIdx, NULL); }
|
| + void disableStage(int stageIdx) {
|
| + this->setEffect(stageIdx, NULL);
|
| + this->setEffectAttribIndices(stageIdx, NULL, 0);
|
| + }
|
|
|
| /**
|
| * Release all the GrEffects referred to by this draw state.
|
| @@ -1021,9 +1028,6 @@
|
| /* 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
|
| };
|
|
|