diff options
author | 2016-12-09 14:06:38 -0500 | |
---|---|---|
committer | 2016-12-09 19:56:24 +0000 | |
commit | 3944484020d98ff8f386378296106c321279482b (patch) | |
tree | a77a4a189b715cc544656929d3d3d71be3aca622 /src/gpu/GrRenderTargetOpList.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 'src/gpu/GrRenderTargetOpList.cpp')
-rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index 41c0d4f9fd..80b0a83610 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -351,9 +351,10 @@ void GrRenderTargetOpList::addDrawOp(const GrPipelineBuilder& pipelineBuilder, void GrRenderTargetOpList::stencilPath(GrRenderTargetContext* renderTargetContext, const GrClip& clip, - bool useHWAA, + GrAAType aaType, const SkMatrix& viewMatrix, const GrPath* path) { + bool useHWAA = (aaType == GrAAType::kMSAA || aaType == GrAAType::kMixedSamples); // TODO: extract portions of checkDraw that are relevant to path stenciling. SkASSERT(path); SkASSERT(this->caps()->shaderCaps()->pathRenderingSupport()); |