diff options
author | bsalomon <bsalomon@google.com> | 2015-06-30 11:37:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-30 11:37:35 -0700 |
commit | c49e8682ab0614e1b6816dadd00f65d770ab6999 (patch) | |
tree | d4b1e381b349e85d1b7e40cc6fe232e7a08d0c57 /src/gpu | |
parent | 37cc0b2e31e4a078b12790253d7032d36271440c (diff) |
Rename flushForExternalRead->flushForExternalIO and always call in SkSurface::getTextureHandle
Review URL: https://codereview.chromium.org/1216243003
Diffstat (limited to 'src/gpu')
-rwxr-xr-x | src/gpu/GrContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrSurface.cpp | 4 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index ed588b6b51..5cb89345e4 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -593,7 +593,7 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target, return true; } -void GrContext::prepareSurfaceForExternalRead(GrSurface* surface) { +void GrContext::prepareSurfaceForExternalIO(GrSurface* surface) { RETURN_IF_ABANDONED SkASSERT(surface); ASSERT_OWNED_RESOURCE(surface); diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp index b304ccb1dd..9685c56275 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/GrSurface.cpp @@ -84,9 +84,9 @@ void GrSurface::flushWrites() { } } -void GrSurface::prepareForExternalRead() { +void GrSurface::prepareForExternalIO() { if (!this->wasDestroyed()) { - this->getContext()->prepareSurfaceForExternalRead(this); + this->getContext()->prepareSurfaceForExternalIO(this); } } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 17d837be42..028ab561f4 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1737,7 +1737,7 @@ bool SkGpuDevice::onShouldDisableLCD(const SkPaint& paint) const { void SkGpuDevice::flush() { DO_DEFERRED_CLEAR(); - fRenderTarget->prepareForExternalRead(); + fRenderTarget->prepareForExternalIO(); } /////////////////////////////////////////////////////////////////////////////// |