diff options
author | Yuqian Li <liyuqian@google.com> | 2017-12-13 19:54:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-13 19:55:01 +0000 |
commit | 2c4e56c3669e0ee01fd4c3917856387a881a8e27 (patch) | |
tree | 33cd14acb432a116346437ba23f3072678b13cc6 /src/gpu | |
parent | b5213b88e89dbbd17bf06de588d9d4e98cf9ce2f (diff) |
Revert "Reimplement TwoPointConicalGradient_gpu"
This reverts commit 84f18c422ae98085c452d3f721ec32228e92f531.
Reason for revert: GMs are incorrect on some mobile devices
Original change's description:
> Reimplement TwoPointConicalGradient_gpu
>
> 4.24% faster in gradient_conical_clamp_shallow_dither
> 6.43% faster in gradient_conicalOutZero_clamp_hicolor
> 10.41% faster in gradient_conicalOut_clamp_hicolor
> 14.85% faster in gradient_conicalOutZero_clamp_3color
> 16.72% faster in gradient_conicalOut_clamp
> 24.30% faster in gradient_conicalOut_clamp_3color
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android,Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android
>
> Bug: skia:
> Change-Id: I6bc1f24c9463fc9c2acbcba7bd4d55b37ade1613
> Reviewed-on: https://skia-review.googlesource.com/82161
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Yuqian Li <liyuqian@google.com>
TBR=egdaniel@google.com,fmalita@google.com,liyuqian@google.com
Change-Id: Ieb20cce12a958abb8293218b89baf3d5a2aad0a8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Cq-Include-Trybots: skia.primary:Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android, Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android
Reviewed-on: https://skia-review.googlesource.com/84801
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrProcessor.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 8f8e7979bb..4294c9fae6 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -54,7 +54,7 @@ SkTArray<GrXPFactoryTestFactory*, true>* GrXPFactoryTestFactory::GetFactories() * we verify the count is as expected. If a new factory is added, then these numbers must be * manually adjusted. */ -static const int kFPFactoryCount = 38; +static const int kFPFactoryCount = 42; static const int kGPFactoryCount = 14; static const int kXPFactoryCount = 4; diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index 0736d036cd..5947f9fe27 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -69,6 +69,8 @@ public: kBlockInputFragmentProcessor_ClassID, kCCPRClipProcessor_ClassID, kCircleGeometryProcessor_ClassID, + kCircleInside2PtConicalEffect_ClassID, + kCircleOutside2PtConicalEffect_ClassID, kCircularRRectEffect_ClassID, kColorMatrixEffect_ClassID, kColorTableEffect_ClassID, @@ -81,9 +83,11 @@ public: kDefaultGeoProc_ClassID, kDIEllipseGeometryProcessor_ClassID, kDisableColorXP_ClassID, - kTwoPointConicalEffect_ClassID, + kEdge2PtConicalEffect_ClassID, kEllipseGeometryProcessor_ClassID, kEllipticalRRectEffect_ClassID, + kFocalInside2PtConicalEffect_ClassID, + kFocalOutside2PtConicalEffect_ClassID, kGP_ClassID, kGrAARectEffect_ClassID, kGrAlphaThresholdFragmentProcessor_ClassID, |