diff options
| author |  Brian Osman <brianosman@google.com> | 2017-02-24 17:27:52 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-24 17:28:03 +0000 |
| commit | aa1ab8905e74096f0460af467f126fdb1998a5f9 (patch) | |
| tree | b98f35612c53f12645fffede85acb0c7a8f9666c /src/gpu/GrTexturePriv.h | |
| parent | 11d2df0bdd58d08ab57bc10eea56bc333664c892 (diff) | |
Revert "Add GrExternalTextureData and SkCrossContextImageData"
This reverts commit 9ad1f92e2fceea33215c0f13cee42a679fb88d44.
Reason for revert: Breaking lots of bots
Original change's description:
> Add GrExternalTextureData and SkCrossContextImageData
>
> GrExternalTextureData is an API for exporting the backend-specific
> information about a texture in a type-safe way, and without pointing
> into the GrTexture. The new detachBackendTexture API lets us release
> ownership of a texture to the client.
>
> SkCrossContextImageData is the public API that lets clients upload
> textures on one thread/GrContext, then safely transfer ownership to
> another thread and GrContext for rendering.
>
> Only GL is implemented/supported right now. Vulkan support requires
> that we add thread-safe memory pools, or otherwise transfer the
> actual memory block containing the texture to the new context.
>
> BUG=skia:
>
> Change-Id: I784a3a74be69807df038c7d192eaed002c7e45ca
> Reviewed-on: https://skia-review.googlesource.com/8529
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,chinmaygarde@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: If27d1f4c3a169efb6533170f67a172664c0fe8ce
Reviewed-on: https://skia-review.googlesource.com/8955
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrTexturePriv.h')
| -rw-r--r-- | src/gpu/GrTexturePriv.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h index cc0a05edfd..042061129d 100644 --- a/src/gpu/GrTexturePriv.h +++ b/src/gpu/GrTexturePriv.h @@ -8,7 +8,6 @@ #ifndef GrTexturePriv_DEFINED #define GrTexturePriv_DEFINED -#include "GrExternalTextureData.h" #include "GrTexture.h" /** Class that adds methods to GrTexture that are only intended for use internal to Skia. @@ -68,15 +67,6 @@ public: } SkDestinationSurfaceColorMode mipColorMode() const { return fTexture->fMipColorMode; } - /** - * Return the native bookkeeping data for this texture, and detach the backend object from - * this GrTexture. It's lifetime will no longer be managed by Ganesh, and this GrTexture will - * no longer refer to it. Leaves this GrTexture in an orphan state. - */ - std::unique_ptr<GrExternalTextureData> detachBackendTexture() { - return fTexture->detachBackendTexture(); - } - static void ComputeScratchKey(const GrSurfaceDesc&, GrScratchKey*); private: |