switch bitmapshader internals over to pixmap

src/opts/SkBitmapProcState_opts_SSE2.cpp

 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <emmintrin.h>
 #include "SkBitmapProcState_opts_SSE2.h"
 #include "SkColorPriv.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 
 void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
                                    const uint32_t* xy,
                                    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());
     SkASSERT(s.fAlphaScale == 256);
 
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
     const uint32_t* row1 = reinterpret_cast<const uint32_t*>(srcAddr + (XY & 0x3FFF) * rb);
     unsigned subY = y0 & 0xF;
 
     // ( 0,  0,  0,  0,  0,  0,  0, 16)
     __m128i sixteen = _mm_cvtsi32_si128(16);
 
     // ( 0,  0,  0,  0, 16, 16, 16, 16)
@@ skipping 81 matching lines @@
         // Extract low int and store.
         *colors++ = _mm_cvtsi128_si32(sum);
     } while (--count > 0);
 }
 
 void S32_alpha_D32_filter_DX_SSE2(const SkBitmapProcState& s,
                                   const uint32_t* xy,
                                   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());
     SkASSERT(s.fAlphaScale < 256);
 
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
     const uint32_t* row1 = reinterpret_cast<const uint32_t*>(srcAddr + (XY & 0x3FFF) * rb);
     unsigned subY = y0 & 0xF;
 
     // ( 0,  0,  0,  0,  0,  0,  0, 16)
     __m128i sixteen = _mm_cvtsi32_si128(16);
 
     // ( 0,  0,  0,  0, 16, 16, 16, 16)
@@ skipping 102 matching lines @@
 
 /*  SSE version of ClampX_ClampY_filter_scale()
  *  portable version is in core/SkBitmapProcState_matrix.h
  */
 void ClampX_ClampY_filter_scale_SSE2(const SkBitmapProcState& s, uint32_t xy[],
                                      int count, int x, int y) {
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
                              SkMatrix::kScale_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     const SkFixed one = s.fFilterOneX;
     const SkFixed dx = s.fInvSx;
     SkFixed fx;
 
     SkPoint pt;
     s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &pt);
     const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1);
-    const unsigned maxY = s.fBitmap->height() - 1;
+    const unsigned maxY = s.fPixmap.height() - 1;
     // compute our two Y values up front
     *xy++ = ClampX_ClampY_pack_filter(fy, maxY, s.fFilterOneY);
     // now initialize fx
     fx = SkScalarToFixed(pt.fX) - (one >> 1);
 
     // test if we don't need to apply the tile proc
     if (dx > 0 && (unsigned)(fx >> 16) <= maxX &&
         (unsigned)((fx + dx * (count - 1)) >> 16) < maxX) {
         if (count >= 4) {
             // SSE version of decal_filter_scale
@@ skipping 94 matching lines @@
 
 /*  SSE version of ClampX_ClampY_nofilter_scale()
  *  portable version is in core/SkBitmapProcState_matrix.h
  */
 void ClampX_ClampY_nofilter_scale_SSE2(const SkBitmapProcState& s,
                                     uint32_t xy[], int count, int x, int y) {
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
                              SkMatrix::kScale_Mask)) == 0);
 
     // we store y, x, x, x, x, x
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     SkFixed fx;
     SkPoint pt;
     s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &pt);
     fx = SkScalarToFixed(pt.fY);
-    const unsigned maxY = s.fBitmap->height() - 1;
+    const unsigned maxY = s.fPixmap.height() - 1;
     *xy++ = SkClampMax(fx >> 16, maxY);
     fx = SkScalarToFixed(pt.fX);
 
     if (0 == maxX) {
         // all of the following X values must be 0
         memset(xy, 0, count * sizeof(uint16_t));
         return;
     }
 
     const SkFixed dx = s.fInvSx;
@@ skipping 100 matching lines @@
     s.fInvProc(s.fInvMatrix,
                SkIntToScalar(x) + SK_ScalarHalf,
                SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
 
     SkFixed oneX = s.fFilterOneX;
     SkFixed oneY = s.fFilterOneY;
     SkFixed fx = SkScalarToFixed(srcPt.fX) - (oneX >> 1);
     SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
 
     if (count >= 2 && (maxX <= 0xFFFF)) {
         SkFixed dx2 = dx + dx;
         SkFixed dy2 = dy + dy;
 
         __m128i wide_f = _mm_set_epi32(fx + dx, fy + dy, fx, fy);
         __m128i wide_d2  = _mm_set_epi32(dx2, dy2, dx2, dy2);
         __m128i wide_one  = _mm_set_epi32(oneX, oneY, oneX, oneY);
         __m128i wide_max = _mm_set_epi32(maxX, maxY, maxX, maxY);
         __m128i wide_mask = _mm_set1_epi32(0xF);
@@ skipping 52 matching lines @@
 
     SkPoint srcPt;
     s.fInvProc(s.fInvMatrix,
                SkIntToScalar(x) + SK_ScalarHalf,
                SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
 
     SkFixed fx = SkScalarToFixed(srcPt.fX);
     SkFixed fy = SkScalarToFixed(srcPt.fY);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     if (count >= 4 && (maxX <= 0xFFFF)) {
         while (((size_t)xy & 0x0F) != 0) {
             *xy++ = (SkClampMax(fy >> 16, maxY) << 16) |
                                   SkClampMax(fx >> 16, maxX);
             fx += dx;
             fy += dy;
             count--;
         }
 
@@ skipping 46 matching lines @@
 
 /*  SSE version of S32_D16_filter_DX_SSE2
  *  Definition is in section of "D16 functions for SRC == 8888" in SkBitmapProcState.cpp
  *  It combines S32_opaque_D32_filter_DX_SSE2 and SkPixel32ToPixel16
  */
 void S32_D16_filter_DX_SSE2(const SkBitmapProcState& s,
                             const uint32_t* xy,
                             int count, uint16_t* colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
-    SkASSERT(s.fBitmap->isOpaque());
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
+    SkASSERT(s.fPixmap.isOpaque());
 
     SkPMColor dstColor;
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
     const uint32_t* row1 = reinterpret_cast<const uint32_t*>(srcAddr + (XY & 0x3FFF) * rb);
     unsigned subY = y0 & 0xF;
 
     // ( 0,  0,  0,  0,  0,  0,  0, 16)
     __m128i sixteen = _mm_cvtsi32_si128(16);
 
     // ( 0,  0,  0,  0, 16, 16, 16, 16)
@@ skipping 78 matching lines @@
 
         // Pack lower 4 16 bit values of sum into lower 4 bytes.
         sum = _mm_packus_epi16(sum, zero);
 
         // Extract low int and store.
         dstColor = _mm_cvtsi128_si32(sum);
 
         *colors++ = SkPixel32ToPixel16(dstColor);
     } while (--count > 0);
 }