From 073285c0595d46205d1482cc19af2d7d891bfeae Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 9 Dec 2016 20:02:08 +0000 Subject: Revert "Reland "Remove antialiasing control from GrPaint."" This reverts commit 3944484020d98ff8f386378296106c321279482b. Reason for revert: Merges badly with a recent change. Will rebase and reland. Original change's description: > 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 > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org BUG=skia: NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Iff9657041e28604a845bc5a9acec7c9b248c53bd Reviewed-on: https://skia-review.googlesource.com/5772 Commit-Queue: Brian Salomon Reviewed-by: Brian Salomon --- src/gpu/GrYUVProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/GrYUVProvider.cpp') diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp index 6fbad18841..13e84dad75 100644 --- a/src/gpu/GrYUVProvider.cpp +++ b/src/gpu/GrYUVProvider.cpp @@ -147,7 +147,7 @@ sk_sp GrYUVProvider::refAsTexture(GrContext* ctx, const SkRect r = SkRect::MakeIWH(yuvInfo.fSizeInfo.fSizes[SkYUVSizeInfo::kY].fWidth, yuvInfo.fSizeInfo.fSizes[SkYUVSizeInfo::kY].fHeight); - renderTargetContext->drawRect(GrNoClip(), paint, GrAA::kNo, SkMatrix::I(), r); + renderTargetContext->drawRect(GrNoClip(), paint, SkMatrix::I(), r); return renderTargetContext->asTexture(); } -- cgit v1.2.3