diff options
| author |  Mike Reed <reed@google.com> | 2017-07-12 08:40:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-12 13:19:35 +0000 |
| commit | 6ee29658202a0bd8394df5daed8db30321c01cc9 (patch) | |
| tree | 1efed95d65f841bbbe8006165f37d9f03a0c0972 /src/core/SkBitmapProcState_matrixProcs.cpp | |
| parent | 016eef47d78091bab7fbd6a445996f252e3283fc (diff) | |
remove unreachable perspective code for imageshader
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Bug: skia:
Change-Id: If9a7df3e1c387098b00bf1cc1a37c36c6d256ef1
Reviewed-on: https://skia-review.googlesource.com/22348
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkBitmapProcState_matrixProcs.cpp')
| -rw-r--r-- | src/core/SkBitmapProcState_matrixProcs.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp index 08753bed99..2860e4b250 100644 --- a/src/core/SkBitmapProcState_matrixProcs.cpp +++ b/src/core/SkBitmapProcState_matrixProcs.cpp @@ -14,7 +14,6 @@ */ #include "SkBitmapProcState.h" -#include "SkPerspIter.h" #include "SkShader.h" #include "SkUtils.h" #include "SkUtilsArm.h" @@ -89,8 +88,6 @@ static SkBitmapProcState::MatrixProc ClampX_ClampY_Procs[] = { ClampX_ClampY_filter_scale, ClampX_ClampY_nofilter_affine, ClampX_ClampY_filter_affine, - NoFilterProc_Persp<ClampTileProcs>, - ClampX_ClampY_filter_persp }; #define MAKENAME(suffix) RepeatX_RepeatY ## suffix @@ -115,8 +112,6 @@ static SkBitmapProcState::MatrixProc RepeatX_RepeatY_Procs[] = { RepeatX_RepeatY_filter_scale, NoFilterProc_Affine<RepeatTileProcs>, RepeatX_RepeatY_filter_affine, - NoFilterProc_Persp<RepeatTileProcs>, - RepeatX_RepeatY_filter_persp }; #endif @@ -146,8 +141,6 @@ static SkBitmapProcState::MatrixProc GeneralXY_Procs[] = { GeneralXY_filter_scale, NoFilterProc_Affine<GeneralTileProcs>, GeneralXY_filter_affine, - NoFilterProc_Persp<GeneralTileProcs>, - GeneralXY_filter_persp }; /////////////////////////////////////////////////////////////////////////////// @@ -449,6 +442,8 @@ static void mirrorx_nofilter_trans(const SkBitmapProcState& s, /////////////////////////////////////////////////////////////////////////////// SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) { + SkASSERT((fInvType & SkMatrix::kPerspective_Mask) == 0); + // test_int_tileprocs(); // check for our special case when there is no scale/affine/perspective if (trivial_matrix && kNone_SkFilterQuality == fFilterQuality) { @@ -467,9 +462,7 @@ SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_m if (fFilterQuality != kNone_SkFilterQuality) { index = 1; } - if (fInvType & SkMatrix::kPerspective_Mask) { - index += 4; - } else if (fInvType & SkMatrix::kAffine_Mask) { + if (fInvType & SkMatrix::kAffine_Mask) { index += 2; } |