diff options
author | reed <reed@google.com> | 2015-06-04 14:12:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 14:12:25 -0700 |
commit | ad7ae6c821c530dd6cb54b0e8931ba8b10e8d87d (patch) | |
tree | 8ef2a833209c3e2c1c445232869c76a320ec1b4c /src/opts/SkBitmapProcState_opts_SSSE3.cpp | |
parent | a84f569f0dbf07da55d168bc56538078dd1d2c08 (diff) |
switch bitmapshader internals over to pixmap
BUG=skia:
NOTRY=True
Review URL: https://codereview.chromium.org/1158273007
Diffstat (limited to 'src/opts/SkBitmapProcState_opts_SSSE3.cpp')
-rw-r--r-- | src/opts/SkBitmapProcState_opts_SSSE3.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp index bfcd7caa72..15a9664c08 100644 --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp @@ -395,7 +395,7 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s, int count, uint32_t* colors) { SkASSERT(count > 0 && colors != NULL); SkASSERT(s.fFilterLevel != kNone_SkFilterQuality); - SkASSERT(kN32_SkColorType == s.fBitmap->colorType()); + SkASSERT(kN32_SkColorType == s.fPixmap.colorType()); if (has_alpha) { SkASSERT(s.fAlphaScale < 256); } else { @@ -403,8 +403,8 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s, } const uint8_t* src_addr = - static_cast<const uint8_t*>(s.fBitmap->getPixels()); - const size_t rb = s.fBitmap->rowBytes(); + static_cast<const uint8_t*>(s.fPixmap.addr()); + const size_t rb = s.fPixmap.rowBytes(); const uint32_t XY = *xy++; const unsigned y0 = XY >> 14; const uint32_t* row0 = @@ -587,7 +587,7 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, int count, uint32_t* colors) { SkASSERT(count > 0 && colors != NULL); SkASSERT(s.fFilterLevel != kNone_SkFilterQuality); - SkASSERT(kN32_SkColorType == s.fBitmap->colorType()); + SkASSERT(kN32_SkColorType == s.fPixmap.colorType()); if (has_alpha) { SkASSERT(s.fAlphaScale < 256); } else { @@ -595,8 +595,8 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, } const uint8_t* src_addr = - static_cast<const uint8_t*>(s.fBitmap->getPixels()); - const size_t rb = s.fBitmap->rowBytes(); + static_cast<const uint8_t*>(s.fPixmap.addr()); + const size_t rb = s.fPixmap.rowBytes(); // vector constants const __m128i mask_dist_select = _mm_set_epi8(12, 12, 12, 12, |