diff options
author | 2017-05-10 12:06:26 -0400 | |
---|---|---|
committer | 2017-05-11 18:07:20 +0000 | |
commit | 85d34b2e841d99dab914111fe2eaa4db99345e1e (patch) | |
tree | e5f7e81602d89c608fc72b0d84827cdfcd154d60 /src/gpu/gl/GrGLTexture.cpp | |
parent | 97627d4434d4f559bd2ccf2235b5d75366add4dd (diff) |
Remove SkCrossContextImageData and all support code
Bug: skia:
Change-Id: I8eb8cef5456c05a8e314d8404698893c7af82d13
Reviewed-on: https://skia-review.googlesource.com/16368
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLTexture.cpp')
-rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index d722f38fd3..ccbd1a6dae 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -5,13 +5,11 @@ * found in the LICENSE file. */ -#include "GrContext.h" #include "GrGLTexture.h" #include "GrGLGpu.h" #include "GrResourceProvider.h" #include "GrSemaphore.h" #include "GrShaderCaps.h" -#include "SkMakeUnique.h" #include "SkTraceMemoryDump.h" #define GPUGL static_cast<GrGLGpu*>(this->getGpu()) @@ -117,27 +115,6 @@ GrBackendObject GrGLTexture::getTextureHandle() const { return reinterpret_cast<GrBackendObject>(&fInfo); } -std::unique_ptr<GrExternalTextureData> GrGLTexture::detachBackendTexture() { - SkASSERT(!this->hasPendingIO()); - - // Set up a semaphore to be signaled once the data is ready, and flush GL - sk_sp<GrSemaphore> semaphore = this->getContext()->resourceProvider()->makeSemaphore(); - this->getGpu()->insertSemaphore(semaphore, true); - - // Make a copy of our GL-specific information - auto data = skstd::make_unique<GrGLExternalTextureData>(fInfo, std::move(semaphore), - this->getContext()); - - // Ensure the cache can't reach this texture anymore - this->detachFromCache(); - - // Detach from the GL object, so we don't use it (or try to delete it when we're freed) - fInfo.fTarget = 0; - fInfo.fID = 0; - - return std::move(data); -} - void GrGLTexture::setMemoryBacking(SkTraceMemoryDump* traceMemoryDump, const SkString& dumpName) const { SkString texture_id; |