Replace fixed-size array of effect stages in GrDrawState with two appendable arrays, one for color,…

Replace fixed-size array of effect stages in GrDrawState with two appendable arrays, one for color, one for coverage.

R=robertphillips@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9592

[robertphillips, 2013-06-13 15:49:04]

lgtm + some nits + questions

Overall I think it looks much cleaner then the old code.

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrContext.cpp#newc...
src/gpu/GrContext.cpp:1557: AutoRestoreEffects* are) {
are should -> should

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.cpp
File src/gpu/GrDrawState.cpp (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.cpp#ne...
src/gpu/GrDrawState.cpp:408: fDrawState->fCommon.fViewMatrix = fViewMatrix;
Should this be ==?

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.cpp#ne...
src/gpu/GrDrawState.cpp:410: int numCoverageStages = fSavedCoordChanges.count()
- fNumColorStages;
Here too?

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.h
File src/gpu/GrDrawState.h (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.h#newc...
src/gpu/GrDrawState.h:340: /// @name Effect Stages
hosts -> host
output color -> output color or coverage

[bsalomon, 2013-06-13 19:34:55]

Committed patchset #4 manually as r9592 (presubmit successful).

[bsalomon, 2013-06-13 19:36:12]

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrContext.cpp#newc...
src/gpu/GrContext.cpp:1557: AutoRestoreEffects* are) {
On 2013/06/13 15:49:04, robertphillips wrote:
> are should -> should

Done.

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.cpp
File src/gpu/GrDrawState.cpp (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.cpp#ne...
src/gpu/GrDrawState.cpp:408: fDrawState->fCommon.fViewMatrix = fViewMatrix;
On 2013/06/13 15:49:04, robertphillips wrote:
> Should this be ==?

No.. it's ok to have added new effects after installing this object. The point
here is to remove the added effects and only leave the effects that were present
when this was installed. But it'd be bad to have removed effects (which can only
be done by reset(), copy cons/op=, or setFromPaint(), or another instance of
this auto-restore object).

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.h
File src/gpu/GrDrawState.h (right):

https://codereview.chromium.org/16952006/diff/2001/src/gpu/GrDrawState.h#newc...
src/gpu/GrDrawState.h:340: /// @name Effect Stages
On 2013/06/13 15:49:04, robertphillips wrote:
> hosts -> host
> output color -> output color or coverage

Done.