remove shadeSpan16 from shader

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
-    #define DSTTYPE SkPMColor
-#elif DSTSIZE==16
-    #define DSTTYPE uint16_t
-#else
-    #error "need DSTSIZE to be 32 or 16"
-#endif
-
-#if (DSTSIZE == 32)
-    #define BITMAPPROC_MEMSET(ptr, value, n) sk_memset32(ptr, value, n)
-#elif (DSTSIZE == 16)
-    #define BITMAPPROC_MEMSET(ptr, value, n) sk_memset16(ptr, value, n)
-#else
-    #error "unsupported DSTSIZE"
-#endif
-
-
 // declare functions externally to suppress warnings.
 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
                               const uint32_t* SK_RESTRICT xy,
-                              int count, DSTTYPE* SK_RESTRICT colors);
+                              int count, SkPMColor* SK_RESTRICT colors);
 void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
-                            int count, DSTTYPE* SK_RESTRICT colors);
+                            int count, SkPMColor* SK_RESTRICT colors);
 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
                           const uint32_t* SK_RESTRICT xy,
-                           int count, DSTTYPE* SK_RESTRICT colors);
+                           int count, SkPMColor* SK_RESTRICT colors);
 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
-                            int count, DSTTYPE* SK_RESTRICT colors);
+                            int count, SkPMColor* SK_RESTRICT colors);
 
 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
                               const uint32_t* SK_RESTRICT xy,
-                              int count, DSTTYPE* SK_RESTRICT colors) {
+                              int count, SkPMColor* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
     const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
     size_t rb = s.fPixmap.rowBytes();
 
@@ skipping 21 matching lines @@
         *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) {
+                            int count, SkPMColor* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != nullptr);
     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.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.fPixmap.height());
     srcAddr = (const SRCTYPE*)((const char*)srcAddr +
                                                 xy[0] * s.fPixmap.rowBytes());
     xy += 1;
 
     SRCTYPE src;
 
     if (1 == s.fPixmap.width()) {
         src = srcAddr[0];
-        DSTTYPE dstValue = RETURNDST(src);
-        BITMAPPROC_MEMSET(colors, dstValue, count);
+        SkPMColor dstValue = RETURNDST(src);
+        sk_memset32(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)];
 
@@ skipping 11 matching lines @@
 
 #ifdef POSTAMBLE
     POSTAMBLE(s);
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
                           const uint32_t* SK_RESTRICT xy,
-                           int count, DSTTYPE* SK_RESTRICT colors) {
+                           int count, SkPMColor* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
     const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
     size_t rb = s.fPixmap.rowBytes();
     unsigned subY;
@@ skipping 25 matching lines @@
         colors += 1;
 
     } while (--count != 0);
 
 #ifdef POSTAMBLE
     POSTAMBLE(s);
 #endif
 }
 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
-                            int count, DSTTYPE* SK_RESTRICT colors) {
+                            int count, SkPMColor* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
         PREAMBLE(s);
 #endif
     const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
     size_t rb = s.fPixmap.rowBytes();
 
@@ skipping 21 matching lines @@
                     colors);
         colors += 1;
     } while (--count != 0);
 
 #ifdef POSTAMBLE
     POSTAMBLE(s);
 #endif
 }
 
 #undef MAKENAME
-#undef DSTSIZE
-#undef DSTTYPE
 #undef SRCTYPE
 #undef CHECKSTATE
 #undef RETURNDST
 #undef SRC_TO_FILTER
 #undef FILTER_TO_DST
 
 #ifdef PREAMBLE
     #undef PREAMBLE
 #endif
 #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