remove bitmaps entirely from sprite blits (as source)

src/core/SkSpriteBlitter_RGB16.cpp

 
 /*
  * Copyright 2006 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 "SkSpriteBlitter.h"
@@ skipping 14 matching lines @@
     uint16_t dc = *dst;
     unsigned sa = SkGetPackedA32(sc);
     unsigned dr, dg, db;
 
     if (255 == sa) {
         dr = SkAlphaBlend(SkPacked32ToR16(sc), SkGetPackedR16(dc), src_scale);
         dg = SkAlphaBlend(SkPacked32ToG16(sc), SkGetPackedG16(dc), src_scale);
         db = SkAlphaBlend(SkPacked32ToB16(sc), SkGetPackedB16(dc), src_scale);
     } else {
         unsigned dst_scale = 255 - SkAlphaMul(sa, src_scale);
-        dr = (SkPacked32ToR16(sc) * src_scale +
-              SkGetPackedR16(dc) * dst_scale) >> 8;
-        dg = (SkPacked32ToG16(sc) * src_scale +
-              SkGetPackedG16(dc) * dst_scale) >> 8;
-        db = (SkPacked32ToB16(sc) * src_scale +
-              SkGetPackedB16(dc) * dst_scale) >> 8;
+        dr = (SkPacked32ToR16(sc) * src_scale + SkGetPackedR16(dc) * dst_scale) >> 8;
+        dg = (SkPacked32ToG16(sc) * src_scale + SkGetPackedG16(dc) * dst_scale) >> 8;
+        db = (SkPacked32ToB16(sc) * src_scale + SkGetPackedB16(dc) * dst_scale) >> 8;
     }
     *dst = SkPackRGB16(dr, dg, db);
 }
 
 #define D16_S32A_Blend_Pixel(dst, sc, src_scale) \
     do { if (sc) D16_S32A_Blend_Pixel_helper(dst, sc, src_scale); } while (0)
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class Sprite_D16_S16_Opaque : public SkSpriteBlitter {
 public:
-    Sprite_D16_S16_Opaque(const SkBitmap& source)
-        : SkSpriteBlitter(source) {}
+    Sprite_D16_S16_Opaque(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
     // overrides
     void blitRect(int x, int y, int width, int height) override {
         uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
-        const uint16_t* SK_RESTRICT src = fSource->addr16(x - fLeft, y - fTop);
+        const uint16_t* SK_RESTRICT src = fSource.addr16(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
         while (--height >= 0) {
             memcpy(dst, src, width << 1);
             dst = (uint16_t*)((char*)dst + dstRB);
             src = (const uint16_t*)((const char*)src + srcRB);
         }
     }
 };
 
 #define D16_S16_Blend_Pixel(dst, sc, scale)     \
@@ skipping 178 matching lines @@
 #define SkSPRITE_PREAMBLE(srcBM, x, y)      const uint16_t* ctable = srcBM.ctable()->read16BitCache(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S16_Blend_Pixel(dst, ctable[src], src_scale)
 #define SkSPRITE_NEXT_ROW
 #define SkSPRITE_POSTAMBLE(srcBM)
 #include "SkSpriteBlitterTemplate.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class Sprite_D16_S32_BlitRowProc : public SkSpriteBlitter {
 public:
-    Sprite_D16_S32_BlitRowProc(const SkBitmap& source)
-        : SkSpriteBlitter(source) {}
+    Sprite_D16_S32_BlitRowProc(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
-    bool setup(const SkBitmap& device, int left, int top,
-                       const SkPaint& paint) override {
-        if (!this->INHERITED::setup(device, left, top, paint)) {
-            return false;
-        }
+    void setup(const SkBitmap& device, int left, int top, const SkPaint& paint) override {
+        this->INHERITED::setup(device, left, top, paint);
 
         unsigned flags = 0;
 
         if (paint.getAlpha() < 0xFF) {
             flags |= SkBlitRow::kGlobalAlpha_Flag;
         }
-        if (!fSource->isOpaque()) {
+        if (!fSource.isOpaque()) {
             flags |= SkBlitRow::kSrcPixelAlpha_Flag;
         }
         if (paint.isDither()) {
             flags |= SkBlitRow::kDither_Flag;
         }
         fProc = SkBlitRow::Factory16(flags);
-        return true;
     }
 
     void blitRect(int x, int y, int width, int height) override {
         uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
-        const SkPMColor* SK_RESTRICT src = fSource->addr32(x - fLeft, y - fTop);
+        const SkPMColor* SK_RESTRICT src = fSource.addr32(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        size_t srcRB = fSource.rowBytes();
         SkBlitRow::Proc16 proc = fProc;
         U8CPU alpha = fPaint->getAlpha();
 
         while (--height >= 0) {
             proc(dst, src, width, alpha, x, y);
             y += 1;
             dst = (uint16_t* SK_RESTRICT)((char*)dst + dstRB);
             src = (const SkPMColor* SK_RESTRICT)((const char*)src + srcRB);
         }
     }
 
 private:
     SkBlitRow::Proc16 fProc;
 
     typedef SkSpriteBlitter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source, const SkPaint& paint,
-        SkTBlitterAllocator* allocator) {
+SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkPixmap& source, const SkPaint& paint,
+                                            SkTBlitterAllocator* allocator) {
 
     SkASSERT(allocator != NULL);
 
     if (paint.getMaskFilter() != NULL) { // may add cases for this
         return NULL;
     }
     if (paint.getXfermode() != NULL) { // may add cases for this
         return NULL;
     }
     if (paint.getColorFilter() != NULL) { // may add cases for this
@@ skipping 50 matching lines @@
                 } else {
                     blitter = allocator->createT<Sprite_D16_SIndex8A_Blend>(source, alpha);
                 }
             }
             break;
         default:
             break;
     }
     return blitter;
 }