diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-09-15 11:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-15 11:41:14 -0700 |
| commit | 249af15fb82833d2274850c589812b6e69df0033 (patch) | |
| tree | ee8ef724d051c484f8b41a5e28a3256a9cfc438c /gm | |
| parent | c90e0149ec530075cae7bf51072a16628311855e (diff) | |
BUG=skia:
R=bsalomon@google.com, egdaniel@google.com, jvanverth@google.com, robertphillips@google.com
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/543623004
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 6 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 6 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index f2e09b028f..924f2a5c40 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -170,7 +170,7 @@ protected: GrDrawState* drawState = tt.target()->drawState(); drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); - drawState->setGeometryProcessor(effect, 1); + drawState->setGeometryProcessor(effect); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); @@ -325,7 +325,7 @@ protected: GrDrawState* drawState = tt.target()->drawState(); drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); - drawState->setGeometryProcessor(effect, 1); + drawState->setGeometryProcessor(effect); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); @@ -509,7 +509,7 @@ protected: GrDrawState* drawState = tt.target()->drawState(); drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex)); - drawState->setGeometryProcessor(effect, 1); + drawState->setGeometryProcessor(effect); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 8d73da5e4d..0938e58db0 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -127,7 +127,6 @@ protected: return; } GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs), sizeof(SkPoint)); SkMatrix m; SkPath p; @@ -139,7 +138,7 @@ protected: if (!effect) { continue; } - drawState->addCoverageEffect(effect, 1); + drawState->addCoverageEffect(effect); drawState->setIdentityViewMatrix(); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); @@ -193,8 +192,7 @@ protected: } GrDrawState* drawState = tt.target()->drawState(); - drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs), sizeof(SkPoint)); - drawState->addCoverageEffect(effect, 1); + drawState->addCoverageEffect(effect); drawState->setIdentityViewMatrix(); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 6cc9799910..b310253e82 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -136,7 +136,7 @@ protected: drawState->reset(viewMatrix); drawState->setRenderTarget(rt); drawState->setColor(0xffffffff); - drawState->addColorEffect(effect, 1); + drawState->addColorEffect(effect); tt.target()->drawSimpleRect(renderRect); x += renderRect.width() + kTestPad; diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index acb6f2251b..d0b511f735 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -118,7 +118,7 @@ protected: drawState->reset(viewMatrix); drawState->setRenderTarget(rt); drawState->setColor(0xffffffff); - drawState->addColorEffect(effect, 1); + drawState->addColorEffect(effect); tt.target()->drawSimpleRect(renderRect); } x += renderRect.width() + kTestPad; |