diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-03 16:54:03 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-10 14:44:55 +0000 |
| commit | ccd4cfc23ebbbecbc6b292359352aad335ad7b73 (patch) | |
| tree | 88940d88f16be8fe4bd943e0264b4c9f4b531ad7 /src/gpu/mtl | |
| parent | f77db110e1c4d2b813ed40de0cf63f65f84b4b64 (diff) | |
Remove GrBackendObject and all related functions from Skia.
Bug: skia:
Change-Id: I59434b7477c0bc26fd982bd81eb97ab94bbba073
Reviewed-on: https://skia-review.googlesource.com/125822
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/mtl')
| -rw-r--r-- | src/gpu/mtl/GrMtlRenderTarget.h | 4 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlRenderTarget.mm | 7 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlTexture.h | 3 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlTexture.mm | 7 |
4 files changed, 0 insertions, 21 deletions
diff --git a/src/gpu/mtl/GrMtlRenderTarget.h b/src/gpu/mtl/GrMtlRenderTarget.h index c653952482..c0f0cf57e1 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.h +++ b/src/gpu/mtl/GrMtlRenderTarget.h @@ -40,10 +40,6 @@ public: return true; } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - GrBackendObject getRenderTargetHandle() const override; -#endif - GrBackendRenderTarget getBackendRenderTarget() const override { return GrBackendRenderTarget(); // invalid } diff --git a/src/gpu/mtl/GrMtlRenderTarget.mm b/src/gpu/mtl/GrMtlRenderTarget.mm index c8060cf88c..c102e6dcfc 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.mm +++ b/src/gpu/mtl/GrMtlRenderTarget.mm @@ -63,13 +63,6 @@ GrMtlGpu* GrMtlRenderTarget::getMtlGpu() const { return static_cast<GrMtlGpu*>(this->getGpu()); } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -GrBackendObject GrMtlRenderTarget::getRenderTargetHandle() const { - void* voidRT = (__bridge_retained void*)fRenderTexture; - return (GrBackendObject)voidRT; -} -#endif - void GrMtlRenderTarget::onAbandon() { fRenderTexture = nil; fResolveTexture = nil; diff --git a/src/gpu/mtl/GrMtlTexture.h b/src/gpu/mtl/GrMtlTexture.h index 21f5e13b19..f75083272a 100644 --- a/src/gpu/mtl/GrMtlTexture.h +++ b/src/gpu/mtl/GrMtlTexture.h @@ -26,9 +26,6 @@ public: id<MTLTexture> mtlTexture() const { return fTexture; } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - GrBackendObject getTextureHandle() const override; -#endif GrBackendTexture getBackendTexture() const override; void textureParamsModified() override {} diff --git a/src/gpu/mtl/GrMtlTexture.mm b/src/gpu/mtl/GrMtlTexture.mm index 534eb6baf7..e029836b60 100644 --- a/src/gpu/mtl/GrMtlTexture.mm +++ b/src/gpu/mtl/GrMtlTexture.mm @@ -71,13 +71,6 @@ GrMtlGpu* GrMtlTexture::getMtlGpu() const { return static_cast<GrMtlGpu*>(this->getGpu()); } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -GrBackendObject GrMtlTexture::getTextureHandle() const { - void* voidTex = (__bridge_retained void*)fTexture; - return (GrBackendObject)voidTex; -} -#endif - GrBackendTexture GrMtlTexture::getBackendTexture() const { return GrBackendTexture(); // invalid } |