diff options
| author |  Brian Osman <brianosman@google.com> | 2017-10-02 13:40:26 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 14:00:07 +0000 |
| commit | 9b1f4bd1766c8fd28405168746492b93d201463e (patch) | |
| tree | 36b4f9eeba4f2f843cbae65109cf0dfd55e5cfe7 /src/gpu/GrTextureProxyPriv.h | |
| parent | 5a2e50edc51006ce91366e177a9d21a16775d7fd (diff) | |
Revert "Revert "Revert "Revert "Revert "Make threaded proxy generation MDB-friendly, and defer instantiation"""""
This reverts commit fdd2cb52b781dd68f515a1eb9fe6d054a0ebc226.
Reason for revert: ANGLE gold failures
Original change's description:
> Revert "Revert "Revert "Revert "Make threaded proxy generation MDB-friendly, and defer instantiation""""
>
> This reverts commit 9f8d4d36b514ffe3cc3a4a48900e3dc1fecb2a96.
>
> Bug: skia:
> Change-Id: I8d7c1df24d8b13b94404f3d9ba69a1ab55ee00c0
> Reviewed-on: https://skia-review.googlesource.com/52920
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,robertphillips@google.com,brianosman@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:
Change-Id: Ie461de167fbd37323cabd4adf064f99204ba4878
Reviewed-on: https://skia-review.googlesource.com/53801
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) {} |