Culling API

src/core/SkPicturePlayback.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 "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 #include "SkTypeface.h"
@@ skipping 689 matching lines @@
     }
     return (DrawType) op;
 }
 
 void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) {
 #ifdef ENABLE_TIME_DRAW
     SkAutoTime  at("SkPicture::draw", 50);
 #endif
 
 #ifdef SPEW_CLIP_SKIPPING
-    SkipClipRec skipRect, skipRRect, skipRegion, skipPath;
+    SkipClipRec skipRect, skipRRect, skipRegion, skipPath, skipCull;
+    unsigned opCount = 0;

[caryclark, 2014/02/14 14:54:35]

nit : this is fine, but seeing unsigned instead of int makes me think that
there's something more tricky going on, not just that it is counting positive
integers.

[f(malita), 2014/02/20 02:37:26]

Will update.

 #endif
 
 #ifdef SK_BUILD_FOR_ANDROID
     SkAutoMutexAcquire autoMutex(fDrawMutex);
 #endif
 
     // kDrawComplete will be the signal that we have reached the end of
     // the command stream
     static const uint32_t kDrawComplete = SK_MaxU32;
 
@@ skipping 44 matching lines @@
         if (callback && callback->abortDrawing()) {
             canvas.restoreToCount(originalSaveCount);
             return;
         }
 #ifdef SK_BUILD_FOR_ANDROID
         if (fAbortCurrentPlayback) {
             return;
         }
 #endif
 
+#ifdef SPEW_CLIP_SKIPPING
+        opCount++;
+#endif
+
         size_t curOffset = reader.offset();
         uint32_t size;
         DrawType op = read_op_and_size(&reader, &size);
         size_t skipTo = 0;
         if (NOOP == op) {
             // NOOPs are to be ignored - do not propagate them any further
             skipTo = curOffset + size;
 #ifdef SK_DEVELOPER
         } else {
             opIndex++;
@@ skipping 75 matching lines @@
                 size_t offsetToRestore = reader.readInt();
                 SkASSERT(!offsetToRestore || \
                          offsetToRestore >= reader.offset());
                 if (!canvas.clipRRect(rrect, regionOp, doAA) && offsetToRestore) {
 #ifdef SPEW_CLIP_SKIPPING
                     skipRRect.recordSkip(offsetToRestore - reader.offset());
 #endif
                     reader.setOffset(offsetToRestore);
                 }
             } break;
+            case PUSH_CULL: {
+                const SkRect& cullRect = reader.skipT<SkRect>();
+                size_t skipOffset = reader.readInt();
+                // FIXME: use inlineable quickRejectNoCheck()

[caryclark, 2014/02/14 14:54:35]

is there a bug associated with this FIXME?

[f(malita), 2014/02/20 02:37:26]

Not yet. I recall that at some point quickReject() was showing up in the
profile, and Mike put up a CL for prototyping - but it's quite intrusive and I
don't think we've measured the actual benefit.

So maybe it's better to drop the fixme and revisit when/if this turns out to be
a problem.

+                if (skipOffset && canvas.quickReject(cullRect)) {
+#ifdef SPEW_CLIP_SKIPPING
+                    skipCull.recordSkip(skipOffset - reader.offset());
+#endif
+                    reader.setOffset(skipOffset);
+                } else {
+                    canvas.pushCull(cullRect);
+                }
+            } break;
+            case POP_CULL:
+                canvas.popCull();
+                break;
             case CONCAT: {
                 SkMatrix matrix;
                 this->getMatrix(reader, &matrix);
                 canvas.concat(matrix);
                 break;
             }
             case DRAW_BITMAP: {
                 const SkPaint* paint = getPaint(reader);
                 const SkBitmap& bitmap = getBitmap(reader);
                 const SkPoint& loc = reader.skipT<SkPoint>();
@@ skipping 230 matching lines @@
             uint32_t skipTo = it.draw();
             if (kDrawComplete == skipTo) {
                 break;
             }
             reader.setOffset(skipTo);
         }
     }
 
 #ifdef SPEW_CLIP_SKIPPING
     {
-        size_t size =  skipRect.fSize + skipRRect.fSize + skipPath.fSize + skipRegion.fSize;
-        SkDebugf("--- Clip skips %d%% rect:%d rrect:%d path:%d rgn:%d\n",
+        size_t size =  skipRect.fSize + skipRRect.fSize + skipPath.fSize + skipRegion.fSize +
+                skipCull.fSize;
+        SkDebugf("--- Clip skips %d%% rect:%d rrect:%d path:%d rgn:%d cull:%d\n",
              size * 100 / reader.offset(), skipRect.fCount, skipRRect.fCount,
-                 skipPath.fCount, skipRegion.fCount);
+                 skipPath.fCount, skipRegion.fCount, skipCull.fCount);
+        SkDebugf("--- Draw ops: %u\n", opCount);
     }
 #endif
 //    this->dumpSize();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG_SIZE
 int SkPicturePlayback::size(size_t* sizePtr) {
     int objects = bitmaps(sizePtr);
@@ skipping 496 matching lines @@
     for (index = 0; index < fPictureCount; index++)
         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
             "picture%p, ", fPictureRefs[index]);
     if (fPictureCount > 0)
         SkDebugf("%s0};\n", pBuffer);
 
     const_cast<SkPicturePlayback*>(this)->dumpStream();
 }
 
 #endif