diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 14:06:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 19:56:24 +0000 |
| commit | 3944484020d98ff8f386378296106c321279482b (patch) | |
| tree | a77a4a189b715cc544656929d3d3d71be3aca622 /gm/yuvtorgbeffect.cpp | |
| parent | d263413a2a92cafe3fd3b051c67d00206c9a0e4d (diff) | |
Reland "Remove antialiasing control from GrPaint."
This contains fixes for GLPrograms test and mixed samples rendering.
This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.
BUG=skia:
Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
Reviewed-on: https://skia-review.googlesource.com/5763
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm/yuvtorgbeffect.cpp')
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 6b90dad9cc..fb0bcf3cfa 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -129,7 +129,8 @@ protected: sk_sp<GrDrawOp> batch( GrRectBatchFactory::CreateNonAAFill(GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get()); + renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, + batch.get()); } x += renderRect.width() + kTestPad; } @@ -244,7 +245,8 @@ protected: grPaint.addColorFragmentProcessor(fp); sk_sp<GrDrawOp> batch(GrRectBatchFactory::CreateNonAAFill( GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get()); + renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, + batch.get()); } } } |