| Index: include/gpu/GrEffectStage.h
|
| diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h
|
| index a3ae9a8c516e55762d4dc2e925767ed6a2df32ad..89231488fa6d12b769297ee4d6be8a03473adcfb 100644
|
| --- a/include/gpu/GrEffectStage.h
|
| +++ b/include/gpu/GrEffectStage.h
|
| @@ -19,11 +19,9 @@
|
|
|
| class GrEffectStage {
|
| public:
|
| - explicit GrEffectStage(const GrEffect* effect, int attrIndex0 = -1, int attrIndex1 = -1)
|
| + explicit GrEffectStage(const GrEffect* effect)
|
| : fEffect(SkRef(effect)) {
|
| fCoordChangeMatrixSet = false;
|
| - fVertexAttribIndices[0] = attrIndex0;
|
| - fVertexAttribIndices[1] = attrIndex1;
|
| }
|
|
|
| GrEffectStage(const GrEffectStage& other) {
|
| @@ -36,7 +34,6 @@ public:
|
| fCoordChangeMatrix = other.fCoordChangeMatrix;
|
| }
|
| fEffect.reset(SkRef(other.fEffect.get()));
|
| - memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
|
| return *this;
|
| }
|
|
|
| @@ -132,16 +129,12 @@ public:
|
|
|
| const GrEffect* getEffect() const { return fEffect.get(); }
|
|
|
| - const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
|
| - int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
|
| -
|
| void convertToPendingExec() { fEffect.convertToPendingExec(); }
|
|
|
| private:
|
| bool fCoordChangeMatrixSet;
|
| SkMatrix fCoordChangeMatrix;
|
| GrProgramElementRef<const GrEffect> fEffect;
|
| - int fVertexAttribIndices[2];
|
| };
|
|
|
| #endif
|
|
|