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/effects | |
| 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/effects')
| -rw-r--r-- | src/gpu/effects/GrCustomXfermode.cpp | 7 | ||||
| -rw-r--r-- | src/gpu/effects/GrPorterDuffXferProcessor.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/effects/GrPorterDuffXferProcessor.h | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index b43cea9a69..bdeda9467c 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -225,8 +225,6 @@ private: const GrCaps&, GrPixelConfigIsClamped) const override; - bool asBlendMode(SkBlendMode* mode) const override; - GR_DECLARE_XP_FACTORY_TEST SkBlendMode fMode; @@ -364,11 +362,6 @@ GrXPFactory::AnalysisProperties CustomXPFactory::analysisProperties( AnalysisProperties::kReadsDstInShader; } -bool CustomXPFactory::asBlendMode(SkBlendMode* mode) const { - *mode = fMode; - return true; -} - GR_DEFINE_XP_FACTORY_TEST(CustomXPFactory); #if GR_TEST_UTILS const GrXPFactory* CustomXPFactory::TestGet(GrProcessorTestData* d) { diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index c8f11e0f5d..f4af7a4679 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -861,11 +861,6 @@ GrXPFactory::AnalysisProperties GrPorterDuffXPFactory::analysisProperties( return analysis_properties(color, coverage, caps, dstIsClamped, fBlendMode); } -bool GrPorterDuffXPFactory::asBlendMode(SkBlendMode* mode) const { - *mode = fBlendMode; - return true; -} - GR_DEFINE_XP_FACTORY_TEST(GrPorterDuffXPFactory); #if GR_TEST_UTILS diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.h b/src/gpu/effects/GrPorterDuffXferProcessor.h index 8241a9f1ab..74ae1533bf 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.h +++ b/src/gpu/effects/GrPorterDuffXferProcessor.h @@ -58,8 +58,6 @@ private: const GrCaps&, GrPixelConfigIsClamped) const override; - bool asBlendMode(SkBlendMode* mode) const override; - GR_DECLARE_XP_FACTORY_TEST static void TestGetXPOutputTypes(const GrXferProcessor*, int* outPrimary, int* outSecondary); |