switch bitmapshader internals over to pixmap

src/core/SkBitmapProcState_sample.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkUtils.h"
 
 #if DSTSIZE==32
@@ skipping 30 matching lines @@
 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
                               const uint32_t* SK_RESTRICT xy,
                               int count, DSTTYPE* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
 
     uint32_t XY;
     SRCTYPE src;
 
     for (int i = (count >> 1); i > 0; --i) {
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
 
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
     }
     if (count & 1) {
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
     }
 
 #ifdef POSTAMBLE
     POSTAMBLE(s);
 #endif
 }
 
 void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
                             int count, DSTTYPE* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
     SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fBitmap->getPixels();
+    const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fPixmap.addr();
 
     // buffer is y32, x16, x16, x16, x16, x16
     // bump srcAddr to the proper row, since we're told Y never changes
-    SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
+    SkASSERT((unsigned)xy[0] < (unsigned)s.fPixmap.height());
     srcAddr = (const SRCTYPE*)((const char*)srcAddr +
-                                                xy[0] * s.fBitmap->rowBytes());
+                                                xy[0] * s.fPixmap.rowBytes());
     xy += 1;
 
     SRCTYPE src;
 
-    if (1 == s.fBitmap->width()) {
+    if (1 == s.fPixmap.width()) {
         src = srcAddr[0];
         DSTTYPE dstValue = RETURNDST(src);
         BITMAPPROC_MEMSET(colors, dstValue, count);
     } else {
         int i;
         for (i = (count >> 2); i > 0; --i) {
             uint32_t xx0 = *xy++;
             uint32_t xx1 = *xy++;
             SRCTYPE x0 = srcAddr[UNPACK_PRIMARY_SHORT(xx0)];
             SRCTYPE x1 = srcAddr[UNPACK_SECONDARY_SHORT(xx0)];
             SRCTYPE x2 = srcAddr[UNPACK_PRIMARY_SHORT(xx1)];
             SRCTYPE x3 = srcAddr[UNPACK_SECONDARY_SHORT(xx1)];
 
             *colors++ = RETURNDST(x0);
             *colors++ = RETURNDST(x1);
             *colors++ = RETURNDST(x2);
             *colors++ = RETURNDST(x3);
         }
         const uint16_t* SK_RESTRICT xx = (const uint16_t*)(xy);
         for (i = (count & 3); i > 0; --i) {
-            SkASSERT(*xx < (unsigned)s.fBitmap->width());
+            SkASSERT(*xx < (unsigned)s.fPixmap.width());
             src = srcAddr[*xx++]; *colors++ = RETURNDST(src);
         }
     }
 
 #ifdef POSTAMBLE
     POSTAMBLE(s);
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
                           const uint32_t* SK_RESTRICT xy,
                            int count, DSTTYPE* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
     unsigned subY;
     const SRCTYPE* SK_RESTRICT row0;
     const SRCTYPE* SK_RESTRICT row1;
 
     // setup row ptrs and update proc_table
     {
         uint32_t XY = *xy++;
         unsigned y0 = XY >> 14;
         row0 = (const SRCTYPE*)(srcAddr + (y0 >> 4) * rb);
         row1 = (const SRCTYPE*)(srcAddr + (XY & 0x3FFF) * rb);
@@ skipping 24 matching lines @@
 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
                             int count, DSTTYPE* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
         PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
 
     do {
         uint32_t data = *xy++;
         unsigned y0 = data >> 14;
         unsigned y1 = data & 0x3FFF;
         unsigned subY = y0 & 0xF;
         y0 >>= 4;
 
         data = *xy++;
         unsigned x0 = data >> 14;
@@ skipping 33 matching lines @@
 #ifdef POSTAMBLE
     #undef POSTAMBLE
 #endif
 
 #undef FILTER_PROC_TYPE
 #undef GET_FILTER_TABLE
 #undef GET_FILTER_ROW
 #undef GET_FILTER_ROW_PROC
 #undef GET_FILTER_PROC
 #undef BITMAPPROC_MEMSET