Index: src/gpu/GrDrawState.h |
=================================================================== |
--- src/gpu/GrDrawState.h (revision 8019) |
+++ src/gpu/GrDrawState.h (working copy) |
@@ -483,8 +483,8 @@ |
/// @name Effect Stages |
//// |
- const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect) { |
- fStages[stageIdx].setEffect(effect); |
+ const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect, const int* indices = NULL) { |
bsalomon
2013/03/08 14:31:58
line wrap
jvanverth1
2013/03/08 17:39:55
Done.
|
+ fStages[stageIdx].setEffect(effect, indices); |
return effect; |
} |
@@ -514,7 +514,9 @@ |
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. |
@@ -1021,9 +1023,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, |
bsalomon
2013/03/08 14:31:58
nice!
|
kVertexEdgeTypeCnt |
}; |