| Index: src/gpu/GrDrawState.h
|
| diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
|
| index ec0ccade3746dec09bb10201b03eec04c903b38d..dcd6ff9aaf8459f03ee68ec12b65c7e38311c02c 100644
|
| --- a/src/gpu/GrDrawState.h
|
| +++ b/src/gpu/GrDrawState.h
|
| @@ -79,12 +79,9 @@
|
| /**
|
| * Sets vertex attributes for next draw. The object driving the templatization
|
| * should be a global GrVertexAttrib array that is never changed.
|
| - *
|
| - * @param count the number of attributes being set, limited to kMaxVertexAttribCnt.
|
| - * @param stride the number of bytes between successive vertex data.
|
| - */
|
| - template <const GrVertexAttrib A[]> void setVertexAttribs(int count, size_t stride) {
|
| - this->internalSetVertexAttribs(A, count, stride);
|
| + */
|
| + template <const GrVertexAttrib A[]> void setVertexAttribs(int count) {
|
| + this->setVertexAttribs(A, count);
|
| }
|
|
|
| /**
|
| @@ -100,13 +97,12 @@
|
| public:
|
| AutoVertexAttribRestore(GrDrawState* drawState);
|
|
|
| - ~AutoVertexAttribRestore() { fDrawState->internalSetVertexAttribs(fVAPtr, fVACount, fVAStride); }
|
| + ~AutoVertexAttribRestore() { fDrawState->setVertexAttribs(fVAPtr, fVACount); }
|
|
|
| private:
|
| GrDrawState* fDrawState;
|
| const GrVertexAttrib* fVAPtr;
|
| int fVACount;
|
| - size_t fVAStride;
|
| };
|
|
|
| /// @}
|
| @@ -563,7 +559,13 @@
|
| // This is used to assert that this condition holds.
|
| SkDEBUGCODE(int fBlockEffectRemovalCnt;)
|
|
|
| - void internalSetVertexAttribs(const GrVertexAttrib attribs[], int count, size_t stride);
|
| + /**
|
| + * Sets vertex attributes for next draw.
|
| + *
|
| + * @param attribs the array of vertex attributes to set.
|
| + * @param count the number of attributes being set, limited to kMaxVertexAttribCnt.
|
| + */
|
| + void setVertexAttribs(const GrVertexAttrib attribs[], int count);
|
|
|
| typedef GrRODrawState INHERITED;
|
| };
|
|
|