diff options
author | Brian Osman <brianosman@google.com> | 2017-03-09 14:19:20 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-09 20:45:00 +0000 |
commit | c1e37059a84044db2db5ae90fa0dd7c7278d9f66 (patch) | |
tree | 2e84f2e1546e4dd5a38ee53edfb343f41e84d250 /src/gpu | |
parent | fb58f14643e0935d853e015f77d76c3d4cee47ac (diff) |
Remove more unused ownership arguments
Technically, we only ever pass kAdopt along one specific code path, but
the remaining functions that have it are at least all similar. This was
another outlier that seems unlikely to ever benefit.
BUG=skia:
Change-Id: If9a1275a2a0b83417225660f5e18c2133681830a
Reviewed-on: https://skia-review.googlesource.com/9494
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrContext.cpp | 10 | ||||
-rw-r--r-- | src/gpu/GrContextPriv.h | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 40e212df8d..01f131020d 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -632,11 +632,10 @@ sk_sp<GrSurfaceContext> GrContextPriv::makeDeferredSurfaceContext(const GrSurfac } sk_sp<GrSurfaceContext> GrContextPriv::makeBackendSurfaceContext(const GrBackendTextureDesc& desc, - sk_sp<SkColorSpace> colorSpace, - GrWrapOwnership ownership) { + sk_sp<SkColorSpace> colorSpace) { ASSERT_SINGLE_OWNER_PRIV - sk_sp<GrSurface> surface(fContext->resourceProvider()->wrapBackendTexture(desc, ownership)); + sk_sp<GrSurface> surface(fContext->resourceProvider()->wrapBackendTexture(desc)); if (!surface) { return nullptr; } @@ -652,12 +651,11 @@ sk_sp<GrSurfaceContext> GrContextPriv::makeBackendSurfaceContext(const GrBackend sk_sp<GrRenderTargetContext> GrContextPriv::makeBackendTextureRenderTargetContext( const GrBackendTextureDesc& desc, sk_sp<SkColorSpace> colorSpace, - const SkSurfaceProps* props, - GrWrapOwnership ownership) { + const SkSurfaceProps* props) { ASSERT_SINGLE_OWNER_PRIV SkASSERT(desc.fFlags & kRenderTarget_GrBackendTextureFlag); - sk_sp<GrSurface> surface(fContext->resourceProvider()->wrapBackendTexture(desc, ownership)); + sk_sp<GrSurface> surface(fContext->resourceProvider()->wrapBackendTexture(desc)); if (!surface) { return nullptr; } diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h index 9128cf4c7e..c70381fe43 100644 --- a/src/gpu/GrContextPriv.h +++ b/src/gpu/GrContextPriv.h @@ -39,14 +39,12 @@ public: // TODO: Maybe add a 'surfaceProps' param (that is ignored for non-RTs) and remove // makeBackendTextureRenderTargetContext & makeBackendTextureAsRenderTargetRenderTargetContext sk_sp<GrSurfaceContext> makeBackendSurfaceContext(const GrBackendTextureDesc& desc, - sk_sp<SkColorSpace> colorSpace, - GrWrapOwnership = kBorrow_GrWrapOwnership); + sk_sp<SkColorSpace> colorSpace); sk_sp<GrRenderTargetContext> makeBackendTextureRenderTargetContext( const GrBackendTextureDesc& desc, sk_sp<SkColorSpace> colorSpace, - const SkSurfaceProps* = nullptr, - GrWrapOwnership = kBorrow_GrWrapOwnership); + const SkSurfaceProps* = nullptr); sk_sp<GrRenderTargetContext> makeBackendRenderTargetRenderTargetContext( const GrBackendRenderTargetDesc& desc, |