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

src/pipe/SkGPipeRead.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 "SkBitmapHeap.h"
 #include "SkCanvas.h"
+#include "SkLight.h"
 #include "SkPaint.h"
 #include "SkGPipe.h"
 #include "SkGPipePriv.h"
 #include "SkReader32.h"
 #include "SkStream.h"
 
 #include "SkAnnotation.h"
 #include "SkColorFilter.h"
 #include "SkDrawLooper.h"
 #include "SkImageFilter.h"
@@ skipping 478 matching lines @@
     const SkRect* cull = NULL;
     if (flags & kDrawAtlas_HasCull_DrawOpFlag) {
         cull = skip<SkRect>(reader, 1);
     }
 
     if (state->shouldDraw()) {
         canvas->drawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
     }
 }
 
+static void drawLitAtlas_rp(SkCanvas* canvas, SkReader32* reader,
+                            uint32_t op32, SkGPipeState* state) {
+    unsigned flags = DrawOp_unpackFlags(op32);
+
+    const SkPaint* paint = NULL;
+    if (flags & kDrawAtlas_HasPaint_DrawOpFlag) {
+        paint = &state->paint();
+    }
+    const int slot = reader->readU32();
+    const SkImage* atlas = state->getImage(slot);
+    const int count = reader->readU32();
+    SkXfermode::Mode mode = (SkXfermode::Mode)reader->readU32();
+    const SkRSXform* xform = skip<SkRSXform>(reader, count);
+    const SkRect* diffTex = skip<SkRect>(reader, count);
+    const SkRect* normTex = skip<SkRect>(reader, count);
+    const SkColor* colors = NULL;
+    if (flags & kDrawAtlas_HasColors_DrawOpFlag) {
+        colors = skip<SkColor>(reader, count);
+    }
+    const SkRect* cull = NULL;
+    if (flags & kDrawAtlas_HasCull_DrawOpFlag) {
+        cull = skip<SkRect>(reader, 1);
+    }
+
+    const int numLights = reader->readU32();
+    const SkLight* lights = skip<SkLight>(reader, numLights);
+
+    if (state->shouldDraw()) {
+        canvas->drawLitAtlas(atlas, xform, diffTex, normTex, colors, count, mode, cull,
+                             paint, lights, numLights);
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static void drawText_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                         SkGPipeState* state) {
     size_t len = reader->readU32();
     const void* text = reader->skip(SkAlign4(len));
     const SkScalar* xy = skip<SkScalar>(reader, 2);
     if (state->shouldDraw()) {
         canvas->drawText(text, len, xy[0], xy[1], state->paint());
     }
@@ skipping 347 matching lines @@
 typedef void (*ReadProc)(SkCanvas*, SkReader32*, uint32_t op32, SkGPipeState*);
 
 static const ReadProc gReadTable[] = {
     skip_rp,
     clipPath_rp,
     clipRegion_rp,
     clipRect_rp,
     clipRRect_rp,
     concat_rp,
     drawAtlas_rp,
+    drawLitAtlas_rp,
     drawBitmap_rp,
     drawBitmapNine_rp,
     drawBitmapRect_rp,
     drawDRRect_rp,
     drawImage_rp,
     drawImageRect_rp,
     drawImageNine_rp,
     drawOval_rp,
     drawPaint_rp,
     drawPatch_rp,
@@ skipping 121 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }