diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-13 08:08:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-13 08:08:25 -0700 |
| commit | 1c735488cbec9abdb25c9a12e0c11af9c302a776 (patch) | |
| tree | e55fc2b07702ae3d9ee8403c97fcdfd21ec02a68 /gm | |
| parent | 5e6ba21f0722fea6b2f95b9d166d7601ffab18bf (diff) | |
Start to propagate constness of GrPipelineBuilder up the stack
BUG=skia:
Review URL: https://codereview.chromium.org/1229143007
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 6 | ||||
| -rw-r--r-- | gm/constcolorprocessor.cpp | 2 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 | ||||
| -rw-r--r-- | gm/rrects.cpp | 2 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 384889f0c5..5e00608fa7 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -229,7 +229,7 @@ protected: SkAutoTUnref<GrBatch> batch( BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs, klmSigns[c])); - tt.target()->drawBatch(&pipelineBuilder, batch); + tt.target()->drawBatch(pipelineBuilder, batch); } ++col; if (numCols == col) { @@ -374,7 +374,7 @@ protected: SkAutoTUnref<GrBatch> batch( BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs, 1.f)); - tt.target()->drawBatch(&pipelineBuilder, batch); + tt.target()->drawBatch(pipelineBuilder, batch); } ++col; if (numCols == col) { @@ -612,7 +612,7 @@ protected: SkAutoTUnref<GrBatch> batch(BezierQuadTestBatch::Create(gp, geometry, DevToUV)); - tt.target()->drawBatch(&pipelineBuilder, batch); + tt.target()->drawBatch(pipelineBuilder, batch); } ++col; if (numCols == col) { diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index 661a5ea8a4..e763305f3b 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -115,7 +115,7 @@ protected: GrPipelineBuilder pipelineBuilder(grPaint, rt, clip); pipelineBuilder.addColorProcessor(fp); - tt.target()->drawSimpleRect(&pipelineBuilder, + tt.target()->drawSimpleRect(pipelineBuilder, grPaint.getColor(), viewMatrix, renderRect); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index b27f7c2039..2c77bceb0a 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -195,7 +195,7 @@ protected: SkAutoTUnref<GrBatch> batch(ConvexPolyTestBatch::Create(gp, geometry)); - tt.target()->drawBatch(&pipelineBuilder, batch); + tt.target()->drawBatch(pipelineBuilder, batch); x += SkScalarCeilToScalar(path->getBounds().width() + 10.f); } @@ -244,7 +244,7 @@ protected: SkAutoTUnref<GrBatch> batch(ConvexPolyTestBatch::Create(gp, geometry)); - tt.target()->drawBatch(&pipelineBuilder, batch); + tt.target()->drawBatch(pipelineBuilder, batch); x += SkScalarCeilToScalar(rect.width() + 10.f); } diff --git a/gm/rrects.cpp b/gm/rrects.cpp index d8d62c4fec..a2a63086b7 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -120,7 +120,7 @@ protected: SkRect bounds = rrect.getBounds(); bounds.outset(2.f, 2.f); - tt.target()->drawSimpleRect(&pipelineBuilder, + tt.target()->drawSimpleRect(pipelineBuilder, 0xff000000, SkMatrix::I(), bounds); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 471360428d..ed74dd7227 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -130,7 +130,7 @@ protected: pipelineBuilder.setRenderTarget(rt); pipelineBuilder.addColorProcessor(fp); - tt.target()->drawSimpleRect(&pipelineBuilder, + tt.target()->drawSimpleRect(pipelineBuilder, GrColor_WHITE, viewMatrix, renderRect); diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 0da1b24116..fff00748ed 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -124,7 +124,7 @@ protected: viewMatrix.setTranslate(x, y); pipelineBuilder.setRenderTarget(rt); pipelineBuilder.addColorProcessor(fp); - tt.target()->drawSimpleRect(&pipelineBuilder, + tt.target()->drawSimpleRect(pipelineBuilder, GrColor_WHITE, viewMatrix, renderRect); |