diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-15 18:41:24 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-15 18:41:31 +0000 |
| commit | 18ea816aad843117cdee99f7d996b3542e467b22 (patch) | |
| tree | 5665ef069823c6a22d3f8a5650a636816f38f897 /src/gpu/GrDrawingManager.h | |
| parent | d492db941a0f8110ef4b6bceacfe788a8d33a5b7 (diff) | |
Revert "Add pre-Flush callback to GrDrawingManager"
This reverts commit d222ec492f5d0229986f529134d083e589bcc4a9.
Reason for revert: TegraX1 Vulkan bot
Original change's description:
> Add pre-Flush callback to GrDrawingManager
>
> This will allow internal systems (e.g., fonts & path renderers) to create pre-flush atlases.
>
> Depends on: https://skia-review.googlesource.com/c/8988/ (Allow GrSurfaceProxy-derived classes to use flags when instantiating)
>
> Change-Id: I307796595d651cf376838bff1f9e4385c3753547
> Reviewed-on: https://skia-review.googlesource.com/8679
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,csmartdalton@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I852648adc12d2aa58cd09c57d961c340d657776c
Reviewed-on: https://skia-review.googlesource.com/9735
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrDrawingManager.h')
| -rw-r--r-- | src/gpu/GrDrawingManager.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h index d914b03a75..061e878793 100644 --- a/src/gpu/GrDrawingManager.h +++ b/src/gpu/GrDrawingManager.h @@ -11,10 +11,9 @@ #include "GrOpFlushState.h" #include "GrPathRenderer.h" #include "GrPathRendererChain.h" -#include "GrPreFlushResourceProvider.h" #include "GrRenderTargetOpList.h" #include "GrResourceCache.h" -#include "SkTArray.h" +#include "SkTDArray.h" #include "text/GrAtlasTextContext.h" class GrContext; @@ -68,8 +67,6 @@ public: void prepareSurfaceForExternalIO(GrSurface*); - void addPreFlushCallbackObject(sk_sp<GrPreFlushCallbackObject> preFlushCBObject); - private: GrDrawingManager(GrContext* context, const GrRenderTargetOpList::Options& optionsForOpLists, @@ -95,7 +92,6 @@ private: void internalFlush(GrResourceCache::FlushType); friend class GrContext; // for access to: ctor, abandon, reset & flush - friend class GrPreFlushResourceProvider; // this is just a shallow wrapper around this class static const int kNumPixelGeometries = 5; // The different pixel geometries static const int kNumDFTOptions = 2; // DFT or no DFT @@ -119,8 +115,6 @@ private: bool fFlushing; bool fIsImmediateMode; - - SkTArray<sk_sp<GrPreFlushCallbackObject>> fPreFlushCBObjects; }; #endif |