diff options
| author |  Brian Osman <brianosman@google.com> | 2017-09-28 17:45:20 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-28 17:45:32 +0000 |
| commit | 9f8d4d36b514ffe3cc3a4a48900e3dc1fecb2a96 (patch) | |
| tree | 332ff8c62c1dff41f48672c001bddedf956a43b6 /src/gpu/GrTextureProxyPriv.h | |
| parent | abb8bb307cea0cf2fae605bd0e80a81854da760e (diff) | |
Revert "Revert "Revert "Make threaded proxy generation MDB-friendly, and defer instantiation"""
This reverts commit e8b8397664666bfcba8f088ea073ede915da8a41.
Reason for revert: More crashing.
Original change's description:
> Revert "Revert "Make threaded proxy generation MDB-friendly, and defer instantiation""
>
> This reverts commit 837c6c7c0cc76bdb9d61a05244ca5f31e7573c37.
>
> Bug: skia:
> Change-Id: I1821f1b2b772c67f1b749692b398eb757d8073c9
> Reviewed-on: https://skia-review.googlesource.com/52744
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=egdaniel@google.com,robertphillips@google.com,brianosman@google.com
Change-Id: I1c8a81ed1000446c298d646d2cd5e7ebd212f18c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/52860
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrTextureProxyPriv.h')
| -rw-r--r-- | src/gpu/GrTextureProxyPriv.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h index e961493179..c3ddb9460c 100644 --- a/src/gpu/GrTextureProxyPriv.h +++ b/src/gpu/GrTextureProxyPriv.h @@ -10,23 +10,11 @@ #include "GrTextureProxy.h" -class GrDeferredProxyUploader; -class GrOpFlushState; - /** * This class hides the more specialized capabilities of GrTextureProxy. */ class GrTextureProxyPriv { public: - // Attach a deferred uploader to the proxy. Holds data being prepared by a worker thread. - void setDeferredUploader(std::unique_ptr<GrDeferredProxyUploader>); - bool isDeferred() const { return SkToBool(fTextureProxy->fDeferredUploader.get()); } - // For a deferred proxy (one that has a deferred uploader attached), this schedules an ASAP - // upload of that data to the instantiated texture. - void scheduleUpload(GrOpFlushState*); - // Clears any deferred uploader object on the proxy. Used to free the CPU data after the - // contents have been uploaded. - void resetDeferredUploader(); private: explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {} |