Add a tiled pipe mode to SampleApp.

Using the "Pipe" checkbox in SamleApp, you can now
toggle amongst three states: no pipe, a normal pipe
(or others depending on #defines), and a tiled pipe.
You can also use shift + p to toggle.
Review URL: https://codereview.appspot.com/6303055

git-svn-id: http://skia.googlecode.com/svn/trunk@4213 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index fd41f00..4f0ad51 100644 (file)
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -10,6 +10,7 @@
         '../gm',       # needed to pull gm.h
         '../samplecode', # To pull SampleApp.h and SampleCode.h
         '../src/gpu', # To pull gl/GrGLUtil.h
+        '../src/pipe/utils', # For TiledPipeController
       ],
       'includes': [
         'gmslides.gypi',
@@ -131,6 +132,10 @@
         '../experimental/Debugger/DebuggerStateView.cpp',
         '../experimental/Debugger/SkDebugDumper.cpp',
         '../experimental/Debugger/SkDebugDumper.h',
+
+        # TiledPipeController
+        '../src/pipe/utils/SamplePipeControllers.h',
+        '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'sources!': [
         '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 5d3296d..e026df9 100644 (file)
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -31,6 +31,9 @@
 #include "SkPDFDocument.h"
 #include "SkStream.h"
 
+#include "SkGPipe.h"
+#include "SamplePipeControllers.h"
+
 extern SampleView* CreateSamplePictFileView(const char filename[]);
 
 class PictFileFactory : public SkViewFactory {
@@ -42,9 +45,6 @@ public:
     }
 };
 
-#define TEST_GPIPE
-
-#ifdef  TEST_GPIPE
 #define PIPE_FILEx
 #ifdef  PIPE_FILE
 #define FILE_PATH "/path/to/drawing.data"
@@ -63,7 +63,6 @@ extern bool is_debugger(SkView* view);
 SkTDArray<char> gTempDataStore;
 #endif
 
-#endif
 
 #define USE_ARROWS_FOR_ZOOM true
 
@@ -761,7 +760,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
     fPerspAnimTime = 0;
     fScale = false;
     fRequestGrabImage = false;
-    fUsePipe = false;
+    fPipeState = SkOSMenu::kOffState;
     fMeasureFPS = false;
     fLCDState = SkOSMenu::kMixedState;
     fAAState = SkOSMenu::kMixedState;
@@ -807,8 +806,9 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
     fAppMenu->assignKeyEquivalentToItem(itemID, 'n');
     itemID = fAppMenu->appendTriState("Hinting", "Hinting", sinkID, fHintingState);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'h');
-    fUsePipeMenuItemID = fAppMenu->appendSwitch("Pipe", "Pipe" , sinkID, fUsePipe);    
-    fAppMenu->assignKeyEquivalentToItem(fUsePipeMenuItemID, 'p');
+    fUsePipeMenuItemID = fAppMenu->appendTriState("Pipe", "Pipe" , sinkID,
+                                                  fPipeState);    
+    fAppMenu->assignKeyEquivalentToItem(fUsePipeMenuItemID, 'P');
 #ifdef DEBUGGER
     itemID = fAppMenu->appendSwitch("Debugger", "Debugger", sinkID, fDebugger);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'q');
@@ -1345,10 +1345,12 @@ void SampleWindow::afterChildren(SkCanvas* orig) {
     SkView* curr = curr_view(this);
     if (fDebugger && !is_debugger(curr) && !is_transition(curr) && !is_overview(curr)) {
         //Stop Pipe when fDebugger is active
-        fUsePipe = false;
-        (void)SampleView::SetUsePipe(curr, false);
-        fAppMenu->getItemByID(fUsePipeMenuItemID)->setBool(fUsePipe);
-        this->onUpdateMenu(fAppMenu);
+        if (fPipeState != SkOSMenu::kOffState) {
+            fPipeState = SkOSMenu::kOffState;
+            (void)SampleView::SetUsePipe(curr, fPipeState);
+            fAppMenu->getItemByID(fUsePipeMenuItemID)->setTriState(fPipeState);
+            this->onUpdateMenu(fAppMenu);
+        }
         
         //Reset any transformations
         fGesture.stop();
@@ -1406,7 +1408,6 @@ void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) {
     if (fPerspAnim) {
         this->inval(NULL);
     }
-    //(void)SampleView::SetUsePipe(child, fUsePipe);
 }
 
 void SampleWindow::afterChild(SkView* child, SkCanvas* canvas) {
@@ -1554,12 +1555,12 @@ bool SampleWindow::onEvent(const SkEvent& evt) {
         this->setDeviceType((DeviceType)selected);
         return true; 
     }
-    if (SkOSMenu::FindSwitchState(evt, "Pipe", &fUsePipe)) {
+    if (SkOSMenu::FindTriState(evt, "Pipe", &fPipeState)) {
 #ifdef PIPE_NET
-        if (!fUsePipe)
+        if (!fPipeState != SkOSMenu::kOnState)
             gServer.disconnectAll();
 #endif
-        (void)SampleView::SetUsePipe(curr_view(this), fUsePipe);
+        (void)SampleView::SetUsePipe(curr_view(this), fPipeState);
         this->updateTitle();
         this->inval(NULL);
         return true;
@@ -1598,10 +1599,10 @@ bool SampleWindow::onEvent(const SkEvent& evt) {
 #ifdef DEBUGGER
     if (SkOSMenu::FindSwitchState(evt, "Debugger", &fDebugger)) {
         if (fDebugger) {
-            fUsePipe = true;
-            (void)SampleView::SetUsePipe(curr_view(this), true);
+            fPipeState = SkOSMenu::kOnState;
+            (void)SampleView::SetUsePipe(curr_view(this), fPipeState);
         } else {
-            this->loadView(fSamples[fCurrIndex]());
+            this->loadView((*fSamples[fCurrIndex])());
         }
         this->inval(NULL);
         return true;
@@ -1918,10 +1919,10 @@ void SampleWindow::loadView(SkView* view) {
 #ifdef DEBUGGER
     if (!is_debugger(view) && !is_overview(view) && !is_transition(view) && fDebugger) {
         //Force Pipe to be on if using debugger
-        fUsePipe = true;
+        fPipeState = SkOSMenu::kOnState;
     }
 #endif
-    (void)SampleView::SetUsePipe(view, fUsePipe);
+    (void)SampleView::SetUsePipe(view, fPipeState);
     if (SampleView::IsSampleView(view))
         ((SampleView*)view)->requestMenu(fSlideMenu);
     this->onUpdateMenu(fSlideMenu);
@@ -2014,10 +2015,18 @@ void SampleWindow::updateTitle() {
     if (fMeasureFPS) {
         title.appendf(" %6.1f ms", fMeasureFPS_Time / (float)FPS_REPEAT_MULTIPLIER);
     }
-    if (fUsePipe && SampleView::IsSampleView(view)) {
-        title.prepend("<P> ");
-    }
     if (SampleView::IsSampleView(view)) {
+        switch (fPipeState) {
+            case SkOSMenu::kOnState:
+                title.prepend("<Pipe> ");
+                break;
+            case SkOSMenu::kMixedState:
+                title.prepend("<Tiled Pipe> ");
+                break;
+                
+            default:
+                break;
+        }
         title.prepend("! ");
     }
 
@@ -2089,9 +2098,9 @@ bool SampleView::SetRepeatDraw(SkView* view, int count) {
     return view->doEvent(evt);
 }
 
-bool SampleView::SetUsePipe(SkView* view, bool pred) {
-    SkEvent evt(set_use_pipe_tag);
-    evt.setFast32(pred);
+bool SampleView::SetUsePipe(SkView* view, SkOSMenu::TriState state) {
+    SkEvent evt;
+    evt.setS32(set_use_pipe_tag, state);
     return view->doEvent(evt);
 }
 
@@ -2100,8 +2109,9 @@ bool SampleView::onEvent(const SkEvent& evt) {
         fRepeatCount = evt.getFast32();
         return true;
     }
-    if (evt.isType(set_use_pipe_tag)) {
-        fUsePipe = !!evt.getFast32();
+    int32_t pipeHolder;
+    if (evt.findS32(set_use_pipe_tag, &pipeHolder)) {
+        fPipeState = static_cast<SkOSMenu::TriState>(pipeHolder);
         return true;
     }
     return this->INHERITED::onEvent(evt);
@@ -2114,18 +2124,12 @@ bool SampleView::onQuery(SkEvent* evt) {
     return this->INHERITED::onQuery(evt);
 }
 
-#ifdef TEST_GPIPE
-    #include "SkGPipe.h"
 
 class SimplePC : public SkGPipeController {
 public:
     SimplePC(SkCanvas* target);
     ~SimplePC();
     
-    /**
-     * User this method to halt/restart pipe
-     */
-    void setWriteToPipe(bool writeToPipe) { fWriteToPipe = writeToPipe; }
     virtual void* requestBlock(size_t minRequest, size_t* actual);
     virtual void notifyWritten(size_t bytes);
 
@@ -2136,7 +2140,6 @@ private:
     size_t          fBytesWritten;
     int             fAtomsWritten;
     SkGPipeReader::Status   fStatus;
-    bool            fWriteToPipe;
 
     size_t        fTotalWritten;
 };
@@ -2147,33 +2150,30 @@ SimplePC::SimplePC(SkCanvas* target) : fReader(target) {
     fStatus = SkGPipeReader::kDone_Status;
     fTotalWritten = 0;
     fAtomsWritten = 0;
-    fWriteToPipe = true;
 }
 
 SimplePC::~SimplePC() {
 //    SkASSERT(SkGPipeReader::kDone_Status == fStatus);
     if (fTotalWritten) {
-        if (fWriteToPipe) {
-            SkDebugf("--- %d bytes %d atoms, status %d\n", fTotalWritten,
-                     fAtomsWritten, fStatus);
+        SkDebugf("--- %d bytes %d atoms, status %d\n", fTotalWritten,
+                 fAtomsWritten, fStatus);
 #ifdef  PIPE_FILE
-            //File is open in append mode
-            FILE* f = fopen(FILE_PATH, "ab");
-            SkASSERT(f != NULL);
-            fwrite((const char*)fBlock + fBytesWritten, 1, bytes, f);
-            fclose(f);
+        //File is open in append mode
+        FILE* f = fopen(FILE_PATH, "ab");
+        SkASSERT(f != NULL);
+        fwrite((const char*)fBlock + fBytesWritten, 1, bytes, f);
+        fclose(f);
 #endif
 #ifdef PIPE_NET
-            if (fAtomsWritten > 1 && fTotalWritten > 4) { //ignore done
-                gServer.acceptConnections();
-                gServer.writePacket(fBlock, fTotalWritten);
-            }
+        if (fAtomsWritten > 1 && fTotalWritten > 4) { //ignore done
+            gServer.acceptConnections();
+            gServer.writePacket(fBlock, fTotalWritten);
+        }
 #endif
 #ifdef  DEBUGGER
-            gTempDataStore.reset();
-            gTempDataStore.append(fTotalWritten, (const char*)fBlock);
+        gTempDataStore.reset();
+        gTempDataStore.append(fTotalWritten, (const char*)fBlock);
 #endif
-        }
     }
     sk_free(fBlock);
 }
@@ -2198,27 +2198,29 @@ void SimplePC::notifyWritten(size_t bytes) {
     fAtomsWritten += 1;
 }
 
-#endif
-
 void SampleView::draw(SkCanvas* canvas) {
-#ifdef TEST_GPIPE
-    if (fUsePipe) {
+    if (SkOSMenu::kOffState == fPipeState) {
+        this->INHERITED::draw(canvas);
+    } else {
         SkGPipeWriter writer;
         SimplePC controller(canvas);
+        TiledPipeController tc(canvas->getDevice()->accessBitmap(false),
+                               &canvas->getTotalMatrix());
+        SkGPipeController* pc;
+        if (SkOSMenu::kMixedState == fPipeState) {
+            pc = &tc;
+        } else {
+            pc = &controller;
+        }
         uint32_t flags = SkGPipeWriter::kCrossProcess_Flag;
-        canvas = writer.startRecording(&controller, flags);
+        
+        canvas = writer.startRecording(pc, flags);
         //Must draw before controller goes out of scope and sends data
         this->INHERITED::draw(canvas);
         //explicitly end recording to ensure writer is flushed before the memory
         //is freed in the deconstructor of the controller
         writer.endRecording();
-        controller.setWriteToPipe(fUsePipe);
     }
-    else
-        this->INHERITED::draw(canvas);
-#else
-    this->INHERITED::draw(canvas);
-#endif
 }
 void SampleView::onDraw(SkCanvas* canvas) {
     this->onDrawBackground(canvas);

diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index c692f9d..e379994 100644 (file)
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -157,7 +157,9 @@ private:
     bool fMagnify;
     
     
-    bool fUsePipe;
+    SkOSMenu::TriState fPipeState;  // Mixed uses a tiled pipe
+                                    // On uses a normal pipe
+                                    // Off uses no pipe
     int  fUsePipeMenuItemID;
     bool fDebugger;
     

diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index 3d1f266..0a582cb 100644 (file)
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -14,7 +14,7 @@
 #include "SkEvent.h"
 #include "SkKey.h"
 #include "SkView.h"
-class SkOSMenu;
+#include "SkOSMenu.h"
 class GrContext;
 
 class SampleCode {
@@ -107,15 +107,15 @@ private:
 
 class SampleView : public SkView {
 public:
-    SampleView() : fBGColor(SK_ColorWHITE), fRepeatCount(1) {
-        fUsePipe = false;
+    SampleView() : fPipeState(SkOSMenu::kOffState), 
+            fBGColor(SK_ColorWHITE), fRepeatCount(1) {
     }
 
     void setBGColor(SkColor color) { fBGColor = color; }
 
     static bool IsSampleView(SkView*);
     static bool SetRepeatDraw(SkView*, int count);
-    static bool SetUsePipe(SkView*, bool);
+    static bool SetUsePipe(SkView*, SkOSMenu::TriState);
     
     /**
      *  Call this to request menu items from a SampleView.
@@ -136,7 +136,7 @@ protected:
     virtual void draw(SkCanvas*);
     virtual void onDraw(SkCanvas*);
 
-    bool fUsePipe;
+    SkOSMenu::TriState fPipeState;
     SkColor fBGColor;
     
 private:

diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 9650a8b..7a50f11 100644 (file)
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -28,7 +28,7 @@ public:
         fPrev = prev;
         fPrev->setClipToBounds(false);
         fPrev->setVisibleP(true);
-        (void)SampleView::SetUsePipe(fPrev, false);
+        (void)SampleView::SetUsePipe(fPrev, SkOSMenu::kOffState);
         //Not calling unref because fPrev is assumed to have been created, so 
         //this will result in a transfer of ownership
         this->attachChildToBack(fPrev);
@@ -36,7 +36,7 @@ public:
         fNext = next;
         fNext->setClipToBounds(true);
         fNext->setVisibleP(true);
-        (void)SampleView::SetUsePipe(fNext, false);
+        (void)SampleView::SetUsePipe(fNext, SkOSMenu::kOffState);
         //Calling unref because next is a newly created view and TransitionView
         //is now the sole owner of fNext
         this->attachChildToFront(fNext)->unref();
@@ -73,7 +73,7 @@ protected:
         if (evt.isType(gReplaceTransitionEvt)) {
             fPrev->detachFromParent();
             fPrev = (SkView*)SkEventSink::FindSink(evt.getFast32());
-            (void)SampleView::SetUsePipe(fPrev, false);
+            (void)SampleView::SetUsePipe(fPrev, SkOSMenu::kOffState);
             //attach the new fPrev and call unref to balance the ref in onDraw
             this->attachChildToBack(fPrev)->unref();
             this->inval(NULL);
@@ -99,7 +99,7 @@ protected:
             return;
 
         if (is_overview(fNext) || is_overview(fPrev)) {
-            fUsePipe = false;
+            fPipeState = SkOSMenu::kOffState;
         }
         
         SkScalar values[4];

diff --git a/src/pipe/utils/SamplePipeControllers.cpp b/src/pipe/utils/SamplePipeControllers.cpp
index 487a2b8..740d1b8 100644 (file)
--- a/src/pipe/utils/SamplePipeControllers.cpp
+++ b/src/pipe/utils/SamplePipeControllers.cpp
@@ -6,9 +6,11 @@
  */
 
 #include "SamplePipeControllers.h"
+
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkGPipe.h"
+#include "SkMatrix.h"
 
 PipeController::PipeController(SkCanvas* target)
 :fReader(target) {
@@ -37,7 +39,8 @@ void PipeController::notifyWritten(size_t bytes) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TiledPipeController::TiledPipeController(const SkBitmap& bitmap)
+TiledPipeController::TiledPipeController(const SkBitmap& bitmap,
+                                         const SkMatrix* initial)
 : INHERITED(NULL) {
     int32_t top = 0;
     int32_t bottom;
@@ -53,6 +56,9 @@ TiledPipeController::TiledPipeController(const SkBitmap& bitmap)
         SkDevice* device = new SkDevice(fBitmaps[i]);
         SkCanvas* canvas = new SkCanvas(device);
         device->unref();
+        if (initial != NULL) {
+            canvas->setMatrix(*initial);
+        }
         canvas->translate(SkIntToScalar(-rect.left()),
                           SkIntToScalar(-rect.top()));
         if (0 == i) {

diff --git a/src/pipe/utils/SamplePipeControllers.h b/src/pipe/utils/SamplePipeControllers.h
index ace6274..0bf81c6 100644 (file)
--- a/src/pipe/utils/SamplePipeControllers.h
+++ b/src/pipe/utils/SamplePipeControllers.h
@@ -9,6 +9,7 @@
 #include "SkGPipe.h"
 
 class SkCanvas;
+class SkMatrix;
 
 class PipeController : public SkGPipeController {
 public:
@@ -30,7 +31,7 @@ private:
 
 class TiledPipeController : public PipeController {
 public:
-    TiledPipeController(const SkBitmap&);
+    TiledPipeController(const SkBitmap&, const SkMatrix* initialMatrix = NULL);
     virtual ~TiledPipeController() {};
     virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
 private: