Make sure attribute indexes are correct after restoring vertex attributes

Fix an assert due to
GrDrawState::CommonState::fFixedFunctionVertexAttribIndices getting
out of sync.  The assertion in GrDrawState::CommonState::operator==
would fire after using AutoVertexAttribRestore.
AutoVertexAttribRestore would change GrDrawState::fCommon.fVAPtr and
fVACount without updating
GrDrawState::fCommon.fFixedFunctionVertexAttribIndices.

R=jvanverth@google.com, bsalomon@google.com, robertphillips@google.com

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/26922004

git-svn-id: http://skia.googlecode.com/svn/trunk@11807 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-10-16 14:43:12 +00:00
parent e4d3d7ca70
commit fe070ba6d8

View File

@ -160,8 +160,7 @@ public:
}
~AutoVertexAttribRestore(){
fDrawState->fCommon.fVAPtr = fVAPtr;
fDrawState->fCommon.fVACount = fVACount;
fDrawState->setVertexAttribs(fVAPtr, fVACount);
}
private: