From 3944484020d98ff8f386378296106c321279482b Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 9 Dec 2016 14:06:38 -0500 Subject: 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 Reviewed-by: Robert Phillips --- gm/yuvtorgbeffect.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gm/yuvtorgbeffect.cpp') 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 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 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()); } } } -- cgit v1.2.3