diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImage.h | 15 | ||||
| -rw-r--r-- | include/core/SkSurface.h | 33 | ||||
| -rw-r--r-- | include/gpu/GrRenderTarget.h | 8 | ||||
| -rw-r--r-- | include/gpu/GrTexture.h | 8 | ||||
| -rw-r--r-- | include/gpu/GrTypes.h | 8 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLTypes.h | 5 | ||||
| -rw-r--r-- | include/gpu/vk/GrVkTypes.h | 4 |
7 files changed, 0 insertions, 81 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index afcbb89a5b..7c693900d3 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -534,21 +534,6 @@ public: */ bool isValid(GrContext* context) const; -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - /** Retrieves the back-end API handle of texture. If flushPendingGrContextIO is true, - complete deferred I/O operations. - - If origin is not nullptr, copies location of content drawn into SkImage. - - @param flushPendingGrContextIO flag to flush outstanding requests - @param origin storage for one of: kTopLeft_GrSurfaceOrigin, - kBottomLeft_GrSurfaceOrigin; or nullptr - @return back-end API texture handle, or nullptr - */ - GrBackendObject getTextureHandle(bool flushPendingGrContextIO, - GrSurfaceOrigin* origin = nullptr) const; -#endif - /** Retrieves the backend texture. If SkImage has no backend texture, an invalid object is returned. Call GrBackendTexture::isValid to determine if the result is valid. diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h index fb0a3685d7..83a59f14fb 100644 --- a/include/core/SkSurface.h +++ b/include/core/SkSurface.h @@ -428,39 +428,6 @@ public: static const BackendHandleAccess kDiscardWrite_TextureHandleAccess = kDiscardWrite_BackendHandleAccess; -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - /** Returns the GPU back-end reference of the texture used by SkSurface, or zero - if SkSurface is not backed by a GPU texture. - - The returned texture handle is only valid until the next draw into SkSurface, - or when SkSurface is deleted. - - @param backendHandleAccess one of: kFlushRead_BackendHandleAccess, - kFlushWrite_BackendHandleAccess, kDiscardWrite_BackendHandleAccess - @return GPU texture reference - */ - GrBackendObject getTextureHandle(BackendHandleAccess backendHandleAccess); - - /** Returns true and stores the GPU back-end reference of the render target used - by SkSurface in backendObject. - - Return false if SkSurface is not backed by a GPU render target, and leaves - backendObject unchanged. - - The returned render target handle is only valid until the next draw into SkSurface, - or when SkSurface is deleted. - - In OpenGL this returns the frame buffer object ID. - - @param backendObject GPU intermediate memory buffer - @param backendHandleAccess one of: kFlushRead_BackendHandleAccess, - kFlushWrite_BackendHandleAccess, kDiscardWrite_BackendHandleAccess - @return true if SkSurface is backed by GPU texture - */ - bool getRenderTargetHandle(GrBackendObject* backendObject, - BackendHandleAccess backendHandleAccess); -#endif - /** Retrieves the backend texture. If Surface has no backend texture, an invalid object is returned. Call GrBackendTexture::isValid to determine if the result is valid. diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index 1c86eaa374..784e15f8b0 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -99,14 +99,6 @@ public: }; virtual ResolveType getResolveType() const = 0; -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - /** - * Return the native ID or handle to the rendertarget, depending on the - * platform. e.g. on OpenGL, return the FBO ID. - */ - virtual GrBackendObject getRenderTargetHandle() const = 0; -#endif - virtual GrBackendRenderTarget getBackendRenderTarget() const = 0; // Checked when this object is asked to attach a stencil buffer. diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h index f7fdb77207..1f75c1f9be 100644 --- a/include/gpu/GrTexture.h +++ b/include/gpu/GrTexture.h @@ -25,14 +25,6 @@ public: GrTexture* asTexture() override { return this; } const GrTexture* asTexture() const override { return this; } -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - /** - * Return the native ID or handle to the texture, depending on the - * platform. e.g. on OpenGL, return the texture ID. - */ - virtual GrBackendObject getTextureHandle() const = 0; -#endif - virtual GrBackendTexture getBackendTexture() const = 0; /** diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index d0e977ebc1..f908d1e1f6 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -207,14 +207,6 @@ enum class GrMipMapped : bool { /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -/** - * Opaque type for 3D API object handles. We are moving away from this type and towards type-safe - * GrBackend* classes (e.g. GrBackendTexture). However, not all replacement APIs are in place yet. - */ -typedef intptr_t GrBackendObject; -#endif - /** * GPU SkImage and SkSurfaces can be stored such that (0, 0) in texture space may correspond to * either the top-left or bottom-left content pixel. diff --git a/include/gpu/gl/GrGLTypes.h b/include/gpu/gl/GrGLTypes.h index 75aa87d971..5916c69181 100644 --- a/include/gpu/gl/GrGLTypes.h +++ b/include/gpu/gl/GrGLTypes.h @@ -128,9 +128,4 @@ struct GrGLFramebufferInfo { } }; -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLTextureInfo*)); -GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLFramebufferInfo*)); -#endif - #endif diff --git a/include/gpu/vk/GrVkTypes.h b/include/gpu/vk/GrVkTypes.h index 68b7f63064..0f7ff71d2e 100644 --- a/include/gpu/vk/GrVkTypes.h +++ b/include/gpu/vk/GrVkTypes.h @@ -112,8 +112,4 @@ struct GrVkImageInfo { } }; -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS -GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrVkImageInfo*)); -#endif - #endif |