Refugee from Dead Machine 11: Add SkCanvas::drawLitAtlas call

src/core/SkPictureRecord.cpp

 /*
  * 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 "SkPictureRecord.h"
 #include "SkDevice.h"
 #include "SkImage_Base.h"
+#include "SkLight.h"
 #include "SkPatchUtils.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
 #include "SkTextBlob.h"
 #include "SkTSearch.h"
 
 #define HEAP_BLOCK_SIZE 4096
 
 enum {
@@ skipping 75 matching lines @@
         0,  // PUSH_CULL - no paint
         0,  // POP_CULL - no paint
         1,  // DRAW_PATCH - right after op code
         1,  // DRAW_PICTURE_MATRIX_PAINT - right after op code
         1,  // DRAW_TEXT_BLOB- right after op code
         1,  // DRAW_IMAGE - right after op code
         1,  // DRAW_IMAGE_RECT_STRICT - right after op code
         1,  // DRAW_ATLAS - right after op code
         1,  // DRAW_IMAGE_NINE - right after op code
         1,  // DRAW_IMAGE_RECT - right after op code
+        1,  // DRAW_LIT_ATLAS - right after op code
     };
 
     SK_COMPILE_ASSERT(sizeof(gPaintOffsets) == LAST_DRAWTYPE_ENUM + 1,
                       need_to_be_in_sync);
     SkASSERT((unsigned)op <= (unsigned)LAST_DRAWTYPE_ENUM);
 
     int overflow = 0;
     if (0 != (opSize & ~MASK_24) || opSize == MASK_24) {
         // This op's size overflows so an extra uint32_t will be written
         // after the op code
@@ skipping 765 matching lines @@
     if (colors) {
         fWriter.write(colors, count * sizeof(SkColor));
         this->addInt(mode);
     }
     if (cull) {
         fWriter.write(cull, sizeof(SkRect));
     }
     this->validate(initialOffset, size);
 }
 
+void SkPictureRecord::onDrawLitAtlas(const SkImage* atlas, const SkRSXform xform[],
+                                     const SkRect diffTex[], const SkRect normTex[],
+                                     const SkColor colors[], int count, SkXfermode::Mode mode,
+                                     const SkRect* cull, const SkPaint* paint,
+                                     const SkLight lights[], int numLights) {
+    // [op + paint-index + atlas-index + flags + count + lightCount] + [xform] + [diffTex + normTex] + 
+    //                [*colors + mode] + cull + [lights]
+    size_t size = 6 * kUInt32Size + count * sizeof(SkRSXform) + 2 * count * sizeof(SkRect) +
+                  numLights * sizeof(SkPoint3);
+    uint32_t flags = 0;
+    if (colors) {
+        flags |= DRAW_ATLAS_HAS_COLORS;
+        size += count * sizeof(SkColor);
+        size += sizeof(uint32_t);   // xfermode::mode
+    }
+    if (cull) {
+        flags |= DRAW_ATLAS_HAS_CULL;
+        size += sizeof(SkRect);
+    }
+    
+    size_t initialOffset = this->addDraw(DRAW_LIT_ATLAS, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_LIT_ATLAS, size) == fWriter.bytesWritten());
+    this->addPaintPtr(paint);
+    this->addImage(atlas);
+    this->addInt(flags);
+    this->addInt(count);
+    fWriter.write(xform, count * sizeof(SkRSXform));
+    fWriter.write(diffTex, count * sizeof(SkRect));
+    fWriter.write(normTex, count * sizeof(SkRect));
+
+    // write optional parameters
+    if (colors) {
+        fWriter.write(colors, count * sizeof(SkColor));
+        this->addInt(mode);
+    }
+    if (cull) {
+        fWriter.write(cull, sizeof(SkRect));
+    }
+
+    this->addInt(numLights);
+    fWriter.write(lights, numLights* sizeof(SkLight));
+
+    this->validate(initialOffset, size);
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info, const SkSurfaceProps&) {
     return NULL;
 }
 
 // If we already have a stored, can we reuse it instead of also storing b?
 static bool equivalent(const SkBitmap& a, const SkBitmap& b) {
     if (a.info() != b.info() || a.pixelRefOrigin() != b.pixelRefOrigin()) {
         // Requiring a.info() == b.info() may be overkill in some cases (alphatype mismatch),
@@ skipping 163 matching lines @@
 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
     int index = fTextBlobRefs.count();
     *fTextBlobRefs.append() = blob;
     blob->ref();
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////