diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 15:10:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:43:41 +0000 |
| commit | 0e8fc8b9e6a138cf4a66b421fb824679df717329 (patch) | |
| tree | 9db412fc2ea22314336f3680249e905c4984902c /src/gpu/GrPipelineBuilder.h | |
| parent | 385836d3d764303cc37c4d1bcc0ab890d209374e (diff) | |
Relandx2 "Remove antialiasing control from GrPaint."
Fixes a bad merge.
This reverts commit 073285c0595d46205d1482cc19af2d7d891bfeae.
Change-Id: I5e92339d9b33d3a6dc58b9fcd2a1b3a5684e8f8a
Reviewed-on: https://skia-review.googlesource.com/5774
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPipelineBuilder.h')
| -rw-r--r-- | src/gpu/GrPipelineBuilder.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h index fcff2adafd..69aa45491a 100644 --- a/src/gpu/GrPipelineBuilder.h +++ b/src/gpu/GrPipelineBuilder.h @@ -29,15 +29,14 @@ class GrTexture; class GrPipelineBuilder : public SkNoncopyable { public: - GrPipelineBuilder(); - +// GrPipelineBuilder(); /** * Initializes the GrPipelineBuilder based on a GrPaint and MSAA availability. Note * that GrPipelineBuilder encompasses more than GrPaint. Aspects of GrPipelineBuilder that have * no GrPaint equivalents are set to default values with the exception of vertex attribute state * which is unmodified by this function and clipping which will be enabled. */ - GrPipelineBuilder(const GrPaint&, bool useHWAA = false); + GrPipelineBuilder(const GrPaint& paint, GrAAType aaType); virtual ~GrPipelineBuilder(); |