diff options
author | Greg Daniel <egdaniel@google.com> | 2017-06-15 21:50:55 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 21:55:03 +0000 |
commit | 7292231905c34ed290ba479338f26b56ae2a7792 (patch) | |
tree | 1a049d8868aa229d230c56dd69e96cf2167a0be8 /src/image/SkSurface.cpp | |
parent | 56af45b03c542ef0bc198e42687bf685aafaae81 (diff) |
Revert "Add API for flushing surfaces with gpu semaphores"
This reverts commit 66366c697853e906d961ae691e2bc5209cdcfa62.
Reason for revert: Failing test on mac bots
Original change's description:
> Add API for flushing surfaces with gpu semaphores
>
> BUG=skia:
>
> Change-Id: Ia4bfef784cd5f2516ceccafce958be18a86f91d1
> Reviewed-on: https://skia-review.googlesource.com/11488
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Forrest Reiling <freiling@google.com>
TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com,freiling@google.com
Change-Id: I75633a2732d2d48b1926f9ad818a9f1a9196d211
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20063
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/image/SkSurface.cpp')
-rw-r--r-- | src/image/SkSurface.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp index fbd9f836d6..cd2a5f185f 100644 --- a/src/image/SkSurface.cpp +++ b/src/image/SkSurface.cpp @@ -184,19 +184,7 @@ bool SkSurface::getRenderTargetHandle(GrBackendObject* obj, BackendHandleAccess } void SkSurface::prepareForExternalIO() { - this->flush(); -} - -void SkSurface::flush() { - asSB(this)->onFlush(0, nullptr); -} - -void SkSurface::flushAndSignalSemaphores(int numSemaphores, GrBackendSemaphore* signalSemaphores) { - return asSB(this)->onFlush(numSemaphores, signalSemaphores); -} - -void SkSurface::wait(int numSemaphores, const GrBackendSemaphore* waitSemaphores) { - asSB(this)->onWait(numSemaphores, waitSemaphores); + asSB(this)->onPrepareForExternalIO(); } ////////////////////////////////////////////////////////////////////////////////////// |