diff options
| author |  Brian Osman <brianosman@google.com> | 2017-09-28 15:14:28 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-28 15:14:40 +0000 |
| commit | 837c6c7c0cc76bdb9d61a05244ca5f31e7573c37 (patch) | |
| tree | 97d1584708ded030488b988157cd47e7d9c3ddaf /include/private | |
| parent | 742f3d02a1c6a916d7e0ed3bedb0b546bbe3c15f (diff) | |
Revert "Make threaded proxy generation MDB-friendly, and defer instantiation"
This reverts commit 742f3d02a1c6a916d7e0ed3bedb0b546bbe3c15f.
Reason for revert: Aaah!
Original change's description:
> Make threaded proxy generation MDB-friendly, and defer instantiation
>
> Replaces GrPrepareCallback with GrDeferredProxyUploader, stored directly
> on GrTextureProxy. Op lists now store a list of referenced proxies that
> are being generated by worker threads. At flush time, iterate over those
> proxies, and invoke their uploader.
>
> Lifetime of the uploader object is now tied to the proxy, but the ASAP
> upload function will free the proxy's uploader, if it's called.
>
> Bug: skia:
> Change-Id: Ieb2c6a805d19990012839a8e103c3ca5b8d3dfc6
> Reviewed-on: https://skia-review.googlesource.com/49904
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,robertphillips@google.com,brianosman@google.com
Change-Id: I8f76a67044dc4159f903097d8b1ef19ffb48c730
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/52760
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/GrTextureProxy.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h index e841baeb1f..8e72eaddb9 100644 --- a/include/private/GrTextureProxy.h +++ b/include/private/GrTextureProxy.h @@ -12,7 +12,6 @@ #include "GrSurfaceProxy.h" class GrCaps; -class GrDeferredProxyUploader; class GrResourceCache; class GrResourceProvider; class GrTextureOpList; @@ -70,7 +69,6 @@ public: protected: friend class GrSurfaceProxy; // for ctors - friend class GrTextureProxyPriv; // Deferred version GrTextureProxy(const GrSurfaceDesc& srcDesc, SkBackingFit, SkBudgeted, @@ -91,11 +89,6 @@ private: GrUniqueKey fUniqueKey; GrResourceCache* fCache; // only set when fUniqueKey is valid - // Only used for proxies whose contents are being prepared on a worker thread. This object - // stores the texture data, allowing the proxy to remain uninstantiated until flush. At that - // point, the proxy is instantiated, and this data is used to perform an ASAP upload. - std::unique_ptr<GrDeferredProxyUploader> fDeferredUploader; - size_t onUninstantiatedGpuMemorySize() const override; // Methods made available via GrTextureProxy::CacheAccess |