diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-04-11 10:08:06 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-12 14:56:10 +0000 |
| commit | ba375a88843160e6884023e9108ea84de8eb3a0f (patch) | |
| tree | 18dc34f015079a4ef7aedbc4d0fc877fa56d6d92 /src/gpu/mtl | |
| parent | 21f6437764253c304c839409ea7883ad56cfcd63 (diff) | |
Add SK_SUPPORT_LEGACY_BACKEND_OBJECTS
This relies on the Chrome CL: https://chromium-review.googlesource.com/c/chromium/src/+/999796 (Add SK_SUPPORT_LEGACY_BACKEND_OBJECTS to SkUserConfig.h) landing first.
Change-Id: Ie0a2b7b84cc02e46957765a0a7d6444a5320769d
Reviewed-on: https://skia-review.googlesource.com/119140
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/mtl')
| -rw-r--r-- | src/gpu/mtl/GrMtlRenderTarget.h | 2 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlRenderTarget.mm | 2 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlTexture.h | 2 | ||||
| -rw-r--r-- | src/gpu/mtl/GrMtlTexture.mm | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/gpu/mtl/GrMtlRenderTarget.h b/src/gpu/mtl/GrMtlRenderTarget.h index 83e7d3c240..c653952482 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.h +++ b/src/gpu/mtl/GrMtlRenderTarget.h @@ -40,7 +40,9 @@ 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 12b507b801..c8060cf88c 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.mm +++ b/src/gpu/mtl/GrMtlRenderTarget.mm @@ -63,10 +63,12 @@ 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; diff --git a/src/gpu/mtl/GrMtlTexture.h b/src/gpu/mtl/GrMtlTexture.h index 3433f38db0..21f5e13b19 100644 --- a/src/gpu/mtl/GrMtlTexture.h +++ b/src/gpu/mtl/GrMtlTexture.h @@ -26,7 +26,9 @@ 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 92afe31a9a..534eb6baf7 100644 --- a/src/gpu/mtl/GrMtlTexture.mm +++ b/src/gpu/mtl/GrMtlTexture.mm @@ -71,10 +71,12 @@ 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 |