| commit | ea81ced1e573c98584e6830a92511f80593af0a4 | [log] [tgz] |
|---|---|---|
| author | djsollen <djsollen@google.com> | Wed Aug 27 13:07:34 2014 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Wed Aug 27 13:07:34 2014 -0700 |
| tree | ef556bb33a22f5c2a02b86e611dcac42a456b40b | |
| parent | c59308d499a1b554d130a79b0bc5819652950484 [diff] [blame] |
Revert of Make setVertexAttribs in GrDrawState take a stride parameter. (patchset #5 of https://codereview.chromium.org/511593004/) Reason for revert: GM failures on http://108.170.220.120:10115/builders/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/builds/1867/ Original issue's description: > Make setVertexAttribs in GrDrawState take a stride parameter. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/af013bf8afc4c77ab8ff230f536e2ade973427fa R=bsalomon@google.com, egdaniel@google.com TBR=bsalomon@google.com, egdaniel@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: djsollen@google.com Review URL: https://codereview.chromium.org/502533004
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index c260382..b29c7c8 100644 --- a/src/gpu/GrAAConvexPathRenderer.cpp +++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -674,7 +674,7 @@ // Our computed verts should all be within one pixel of the segment control points. devBounds.outset(SK_Scalar1, SK_Scalar1); - drawState->setVertexAttribs<gPathAttribs>(SK_ARRAY_COUNT(gPathAttribs), sizeof(QuadVertex)); + drawState->setVertexAttribs<gPathAttribs>(SK_ARRAY_COUNT(gPathAttribs)); static const int kEdgeAttrIndex = 1; GrEffect* quadEffect = QuadEdgeEffect::Create(); @@ -684,6 +684,7 @@ if (!arg.succeeded()) { return false; } + SkASSERT(sizeof(QuadVertex) == drawState->getVertexSize()); verts = reinterpret_cast<QuadVertex*>(arg.vertices()); idxs = reinterpret_cast<uint16_t*>(arg.indices());