diff options
| author |  djsollen <djsollen@google.com> | 2014-08-27 13:07:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-27 13:07:34 -0700 |
| commit | ea81ced1e573c98584e6830a92511f80593af0a4 (patch) | |
| tree | ef556bb33a22f5c2a02b86e611dcac42a456b40b /src/gpu/GrAAHairLinePathRenderer.cpp | |
| parent | c59308d499a1b554d130a79b0bc5819652950484 (diff) | |
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
Diffstat (limited to 'src/gpu/GrAAHairLinePathRenderer.cpp')
| -rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 2114720f34..d5ff40d955 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -731,8 +731,8 @@ bool GrAAHairLinePathRenderer::createLineGeom(const SkPath& path, int vertCnt = kVertsPerLineSeg * lineCnt; - drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs), - sizeof(LineVertex)); + drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs)); + SkASSERT(sizeof(LineVertex) == drawState->getVertexSize()); if (!arg->set(target, vertCnt, 0)) { return false; @@ -778,8 +778,8 @@ bool GrAAHairLinePathRenderer::createBezierGeom( int vertCnt = kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt; - int vAttribCnt = SK_ARRAY_COUNT(gHairlineBezierAttribs); - target->drawState()->setVertexAttribs<gHairlineBezierAttribs>(vAttribCnt, sizeof(BezierVertex)); + target->drawState()->setVertexAttribs<gHairlineBezierAttribs>(SK_ARRAY_COUNT(gHairlineBezierAttribs)); + SkASSERT(sizeof(BezierVertex) == target->getDrawState().getVertexSize()); if (!arg->set(target, vertCnt, 0)) { return false; |