aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/gl
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-02-24 17:27:52 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-24 17:28:03 +0000
commitaa1ab8905e74096f0460af467f126fdb1998a5f9 (patch)
treeb98f35612c53f12645fffede85acb0c7a8f9666c /include/gpu/gl
parent11d2df0bdd58d08ab57bc10eea56bc333664c892 (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 'include/gpu/gl')
-rw-r--r--include/gpu/gl/GrGLTypes.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/gpu/gl/GrGLTypes.h b/include/gpu/gl/GrGLTypes.h
index d03363c75e..5b9e31de1a 100644
--- a/include/gpu/gl/GrGLTypes.h
+++ b/include/gpu/gl/GrGLTypes.h
@@ -9,7 +9,6 @@
#ifndef GrGLTypes_DEFINED
#define GrGLTypes_DEFINED
-#include "GrExternalTextureData.h"
#include "GrGLConfig.h"
/**
@@ -113,23 +112,6 @@ struct GrGLTextureInfo {
GrGLuint fID;
};
-class GrGLExternalTextureData : public GrExternalTextureData {
-public:
- GrGLExternalTextureData(const GrGLTextureInfo& info, GrFence fence)
- : INHERITED(fence)
- , fInfo(info) {}
- GrBackend getBackend() const override { return kOpenGL_GrBackend; }
-
-protected:
- GrBackendObject getBackendObject() const override {
- return reinterpret_cast<GrBackendObject>(&fInfo);
- }
-
- GrGLTextureInfo fInfo;
-
- typedef GrExternalTextureData INHERITED;
-};
-
GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLTextureInfo*));
#endif