diff options
| author |  robertphillips <robertphillips@google.com> | 2014-09-02 10:20:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-02 10:20:50 -0700 |
| commit | 98d709bc8d0761df8e0ad35e92c06e500f0be50d (patch) | |
| tree | 4a368c80280ce21d8015f52a37ca635600f83ec0 /include | |
| parent | 842b086a3c876061e1279d47e6009629c9818b03 (diff) | |
Reorganize Layer Hoisting code
With the new MultiPictureDraw API the GrContext will be performing the layer hoisting (instead of the SkGpuDevice). This CL being moving the layer hoisting functionality to GrLayerHoister rather then dumping it straight into GrContext.
R=bsalomon@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/531733003
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPicture.h | 1 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 6a5404085e..74d436b43f 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -295,6 +295,7 @@ private: friend class SkPictureData; // to access OperationList friend class SkPictureRecorder; // just for SkPicture-based constructor friend class SkGpuDevice; // for EXPERIMENTAL_getActiveOps/OperationList + friend class GrLayerHoister; // for EXPERIMENTAL_getActiveOps/OperationList friend class CollectLayers; // access to fRecord friend class SkPicturePlayback; // to get fData & OperationList friend class SkPictureReplacementPlayback; // to access OperationList diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 838abc1e6b..91fc2f0bb6 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -122,15 +122,6 @@ protected: virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE; virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; - static bool FindLayersToHoist(const GrAccelData *gpuData, - const SkPicture::OperationList* ops, - const SkRect& query, - bool* pullForward); - void drawLayers(const SkPicture* picture, - const SkTDArray<GrCachedLayer*>& atlased, - const SkTDArray<GrCachedLayer*>& nonAtlased); - void unlockLayers(const SkPicture* picture); - /** PRIVATE / EXPERIMENTAL -- do not call */ virtual void EXPERIMENTAL_optimize(const SkPicture* picture) SK_OVERRIDE; /** PRIVATE / EXPERIMENTAL -- do not call */ |