diff options
author | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-12 21:14:33 +0000 |
---|---|---|
committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-12 21:14:33 +0000 |
commit | d64d8a905a044204c5960e29cdf8adf1f130edce (patch) | |
tree | 22523a4bb1944558f181e0db29dd3a360cc1fc6b /src/opts/SkBitmapProcState_opts_SSSE3.cpp | |
parent | 5383a7525355dec72efa2083aeadffdd09a962b9 (diff) |
Working plumb of image scaling:
1) always generate mipmaps if we detect that we are downsampling.
2) pre-scale the image if we detect that we are upsampling
(currently valid for scale+translate only)
3) A few miscellaneous bug fixes related to image scaling.
Still need SSE/Neon versions of these image scalers.
BUG=
R=bsalomon@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/18978014
git-svn-id: http://skia.googlecode.com/svn/trunk@10056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts/SkBitmapProcState_opts_SSSE3.cpp')
-rw-r--r-- | src/opts/SkBitmapProcState_opts_SSSE3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp index 1246b953f4..f18b7e1eb1 100644 --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp @@ -385,7 +385,7 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s, const uint32_t* xy, int count, uint32_t* colors) { SkASSERT(count > 0 && colors != NULL); - SkASSERT(s.fDoFilter); + SkASSERT(s.fFilterQuality != SkBitmapProcState::kNone_BitmapFilter); SkASSERT(s.fBitmap->config() == SkBitmap::kARGB_8888_Config); if (has_alpha) { SkASSERT(s.fAlphaScale < 256); @@ -576,7 +576,7 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, const uint32_t* xy, int count, uint32_t* colors) { SkASSERT(count > 0 && colors != NULL); - SkASSERT(s.fDoFilter); + SkASSERT(s.fFilterQuality != SkBitmapProcState::kNone_BitmapFilter); SkASSERT(s.fBitmap->config() == SkBitmap::kARGB_8888_Config); if (has_alpha) { SkASSERT(s.fAlphaScale < 256); |