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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 6 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index e0a1d8726e..2045e38ec4 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -168,7 +168,7 @@ protected: context->getTestTarget(&tt); SkASSERT(NULL != tt.target()); GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); + drawState->setVertexAttribs<kAttribs>(2); drawState->addCoverageEffect(effect, 1); drawState->setRenderTarget(rt); @@ -323,7 +323,7 @@ protected: context->getTestTarget(&tt); SkASSERT(NULL != tt.target()); GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); + drawState->setVertexAttribs<kAttribs>(2); drawState->addCoverageEffect(effect, 1); drawState->setRenderTarget(rt); @@ -507,7 +507,7 @@ protected: context->getTestTarget(&tt); SkASSERT(NULL != tt.target()); GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); + drawState->setVertexAttribs<kAttribs>(2); drawState->addCoverageEffect(effect, 1); drawState->setRenderTarget(rt); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 275193f326..00e89db2b1 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -127,7 +127,7 @@ protected: return; } GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs), sizeof(SkPoint)); + drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs)); SkMatrix m; SkPath p; @@ -193,7 +193,7 @@ protected: } GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs), sizeof(SkPoint)); + drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs)); drawState->addCoverageEffect(effect, 1); drawState->setIdentityViewMatrix(); drawState->setRenderTarget(rt); |