diff options
| author |  Mike Reed <reed@google.com> | 2017-08-23 01:26:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-23 12:41:35 +0000 |
| commit | dc03ddeb7e716ca871f9ca6a3b3ffb0ce6caa548 (patch) | |
| tree | 2a9a22c6c0daab6611c4cfc1fc0066cf518ce70d /src/core/SkBitmapProcState_matrixProcs.cpp | |
| parent | 5141d215e068c630dacc8865ffb46efd7f0f3911 (diff) | |
remove code associated with legacy affine imageshaders
requires https://skia-review.googlesource.com/c/33180
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Bug: skia:
Change-Id: I226e120cc5aebe393bda8bc069e7927fdc981a0e
Reviewed-on: https://skia-review.googlesource.com/36800
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkBitmapProcState_matrixProcs.cpp')
| -rw-r--r-- | src/core/SkBitmapProcState_matrixProcs.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp index 2860e4b250..ea28318f90 100644 --- a/src/core/SkBitmapProcState_matrixProcs.cpp +++ b/src/core/SkBitmapProcState_matrixProcs.cpp @@ -77,17 +77,11 @@ void ClampX_ClampY_nofilter_scale(const SkBitmapProcState& s, uint32_t xy[], int count, int x, int y) { return NoFilterProc_Scale<ClampTileProcs, true>(s, xy, count, x, y); } -void ClampX_ClampY_nofilter_affine(const SkBitmapProcState& s, uint32_t xy[], - int count, int x, int y) { - return NoFilterProc_Affine<ClampTileProcs>(s, xy, count, x, y); -} static SkBitmapProcState::MatrixProc ClampX_ClampY_Procs[] = { // only clamp lives in the right coord space to check for decal ClampX_ClampY_nofilter_scale, ClampX_ClampY_filter_scale, - ClampX_ClampY_nofilter_affine, - ClampX_ClampY_filter_affine, }; #define MAKENAME(suffix) RepeatX_RepeatY ## suffix @@ -110,8 +104,6 @@ struct RepeatTileProcs { static SkBitmapProcState::MatrixProc RepeatX_RepeatY_Procs[] = { NoFilterProc_Scale<RepeatTileProcs, false>, RepeatX_RepeatY_filter_scale, - NoFilterProc_Affine<RepeatTileProcs>, - RepeatX_RepeatY_filter_affine, }; #endif @@ -139,8 +131,6 @@ struct GeneralTileProcs { static SkBitmapProcState::MatrixProc GeneralXY_Procs[] = { NoFilterProc_Scale<GeneralTileProcs, false>, GeneralXY_filter_scale, - NoFilterProc_Affine<GeneralTileProcs>, - GeneralXY_filter_affine, }; /////////////////////////////////////////////////////////////////////////////// @@ -442,7 +432,7 @@ static void mirrorx_nofilter_trans(const SkBitmapProcState& s, /////////////////////////////////////////////////////////////////////////////// SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) { - SkASSERT((fInvType & SkMatrix::kPerspective_Mask) == 0); + SkASSERT((fInvType & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) == 0); // test_int_tileprocs(); // check for our special case when there is no scale/affine/perspective @@ -462,9 +452,6 @@ SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_m if (fFilterQuality != kNone_SkFilterQuality) { index = 1; } - if (fInvType & SkMatrix::kAffine_Mask) { - index += 2; - } if (SkShader::kClamp_TileMode == fTileModeX && SkShader::kClamp_TileMode == fTileModeY) { // clamp gets special version of filterOne |