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-21 18:25:38 +0000 |
| commit | 6d138bf681eee54a8b4a40e5dbbd08a137ae0d93 (patch) | |
| tree | 7eb05a8c09ad212fc9a693296287f2b62b2f99f8 /src/gpu/gl | |
| parent | be3c1d22c7d3e18cee9f1697827392e16b436df2 (diff) | |
Reland "Remove GrBackendObject and all related functions from Skia."
This is a reland of ccd4cfc23ebbbecbc6b292359352aad335ad7b73
Original change's description:
> 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>
Bug: skia:
Change-Id: Ibd1b9bd04b36840d9d872e2f0970dd6bac378bc9
Reviewed-on: https://skia-review.googlesource.com/129380
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLRenderTarget.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLTexture.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h index 4412dcf425..a9ec3c385c 100644 --- a/src/gpu/gl/GrGLRenderTarget.h +++ b/src/gpu/gl/GrGLRenderTarget.h @@ -61,10 +61,6 @@ public: } } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - GrBackendObject getRenderTargetHandle() const override { return fRTFBOID; } -#endif - GrBackendRenderTarget getBackendRenderTarget() const override; bool canAttemptStencilAttachment() const override; diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index bf22bdb751..2d674f4756 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -97,12 +97,6 @@ void GrGLTexture::onAbandon() { INHERITED::onAbandon(); } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -GrBackendObject GrGLTexture::getTextureHandle() const { - return reinterpret_cast<GrBackendObject>(&fInfo); -} -#endif - GrBackendTexture GrGLTexture::getBackendTexture() const { return GrBackendTexture(this->width(), this->height(), this->texturePriv().mipMapped(), fInfo); } diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h index fcc85bc700..67eab4312e 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/gl/GrGLTexture.h @@ -39,9 +39,6 @@ public: SkASSERT(!fReleaseHelper); } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - GrBackendObject getTextureHandle() const override; -#endif GrBackendTexture getBackendTexture() const override; void textureParamsModified() override { fTexParams.invalidate(); } |