diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-07-29 17:36:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-29 21:55:00 +0000 |
| commit | 28a586966d5862312ed9e1b8d7de25b25b0f1b48 (patch) | |
| tree | 0c837f77227e06c8bbc846e1d9b177c1bfb47a9a /src | |
| parent | 93fe0ccd240c5af89458867e892364c3020fca89 (diff) | |
Remove now-dead SK_SUPPORT_LEGACY_GRADIENT_MATRIX_MATH code
Change-Id: I080942c44d2ce1a018ba127944c0a477af876158
TBR=
Reviewed-on: https://skia-review.googlesource.com/28480
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shaders/gradients/SkLinearGradient.cpp | 4 | ||||
| -rw-r--r-- | src/shaders/gradients/SkRadialGradient.cpp | 5 | ||||
| -rw-r--r-- | src/shaders/gradients/SkSweepGradient.cpp | 4 | ||||
| -rw-r--r-- | src/shaders/gradients/SkTwoPointConicalGradient.cpp | 5 |
4 files changed, 0 insertions, 18 deletions
diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp index 5ad4075721..605ae544a2 100644 --- a/src/shaders/gradients/SkLinearGradient.cpp +++ b/src/shaders/gradients/SkLinearGradient.cpp @@ -83,11 +83,7 @@ bool SkLinearGradient::adjustMatrixAndAppendStages(SkArenaAlloc*, SkMatrix* matrix, SkRasterPipeline*, SkRasterPipeline*) const { -#ifdef SK_SUPPORT_LEGACY_GRADIENT_MATRIX_MATH - *matrix = SkMatrix::Concat(fPtsToUnit, *matrix); -#else matrix->postConcat(fPtsToUnit); -#endif return true; } diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp index a8e48db4e0..fc484828eb 100644 --- a/src/shaders/gradients/SkRadialGradient.cpp +++ b/src/shaders/gradients/SkRadialGradient.cpp @@ -381,12 +381,7 @@ bool SkRadialGradient::adjustMatrixAndAppendStages(SkArenaAlloc* alloc, SkMatrix* matrix, SkRasterPipeline* p, SkRasterPipeline*) const { -#ifdef SK_SUPPORT_LEGACY_GRADIENT_MATRIX_MATH - matrix->postTranslate(-fCenter.fX, -fCenter.fY); - matrix->postScale(1/fRadius, 1/fRadius); -#else matrix->postConcat(fPtsToUnit); -#endif p->append(SkRasterPipeline::xy_to_radius); return true; diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp index da9eaefa99..8a2e5307b2 100644 --- a/src/shaders/gradients/SkSweepGradient.cpp +++ b/src/shaders/gradients/SkSweepGradient.cpp @@ -228,11 +228,7 @@ bool SkSweepGradient::adjustMatrixAndAppendStages(SkArenaAlloc* alloc, SkMatrix* matrix, SkRasterPipeline* p, SkRasterPipeline*) const { -#ifdef SK_SUPPORT_LEGACY_GRADIENT_MATRIX_MATH - matrix->postTranslate(-fCenter.fX, -fCenter.fY); -#else matrix->postConcat(fPtsToUnit); -#endif p->append(SkRasterPipeline::xy_to_unit_angle); return true; diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp index 65842f2b5f..22ae177559 100644 --- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp @@ -182,14 +182,9 @@ bool SkTwoPointConicalGradient::adjustMatrixAndAppendStages(SkArenaAlloc* alloc, // When the two circles are concentric, we can pretend we're radial (with a tiny *twist). if (SkScalarNearlyZero(dCenter)) { -#ifdef SK_SUPPORT_LEGACY_GRADIENT_MATRIX_MATH - matrix->postTranslate(-fCenter1.fX, -fCenter1.fY); - matrix->postScale(1 / fRadius2, 1 / fRadius2); -#else const SkMatrix tmp = SkMatrix::Concat(SkMatrix::MakeScale(1 / fRadius2, 1 / fRadius2), SkMatrix::MakeTrans(-fCenter1.fX, -fCenter1.fY)); matrix->postConcat(tmp); -#endif p->append(SkRasterPipeline::xy_to_radius); // Tiny twist: radial computes a t for [0, r2], but we want a t for [r1, r2]. |