diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-01-12 20:58:02 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-12 20:58:14 +0000 |
| commit | befff6580e9dc6b15bc6db3cc3f5fff22185cba8 (patch) | |
| tree | b259179938ee4af71e9fd3db69c985bf86f9a5ac /src/gpu/GrRenderTargetContext.h | |
| parent | 9d6929cccfc3e64e75e6ef5b37f284b01b68fb28 (diff) | |
Revert "Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs."
This reverts commit 7cdabedc8b73b70e4aa70c5621a4bdc8e00ede44.
Reason for revert: Speculative revert for causing GLProgram failure on textureBarrierSupport assert
Original change's description:
> Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs.
>
> This improves performance.
>
> Bug: skia:
> Change-Id: Ie01170ec084be66ea166b2baffcdb415583aa523
> Reviewed-on: https://skia-review.googlesource.com/93321
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: I327e133c889207fb682bec7d6a95f9bf1403770b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/94161
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.h')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h index 9e4fb3277c..2ae52b922c 100644 --- a/src/gpu/GrRenderTargetContext.h +++ b/src/gpu/GrRenderTargetContext.h @@ -386,12 +386,8 @@ protected: private: class TextTarget; - GrAAType chooseAAType( - GrAA aa, GrAllowMixedSamples allowMixedSamples, - GrAllowNonAABinaryCoverage allowNonAABinaryCoverage = GrAllowNonAABinaryCoverage::kNo, - const GrPaint* paint = nullptr) { - return GrChooseAAType(aa, this->fsaaType(), allowMixedSamples, allowNonAABinaryCoverage, - paint, *this->caps()); + inline GrAAType chooseAAType(GrAA aa, GrAllowMixedSamples allowMixedSamples) { + return GrChooseAAType(aa, this->fsaaType(), allowMixedSamples, *this->caps()); } friend class GrAtlasTextBlob; // for access to add[Mesh]DrawOp |