diff options
author | bsalomon <bsalomon@google.com> | 2016-04-13 14:29:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 14:29:25 -0700 |
commit | 7e68ab73186ab02a6030d3959e7372f983f85af5 (patch) | |
tree | 973b20fb786c0e2ac42344652ec07a36d112b3f8 /src/gpu/gl | |
parent | 0e3c55431b463b5575983c0c875909e08a3562bf (diff) |
Remove GrTextureStorageAllocator. This was added from Chromium but never used and not expected to be used.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1886613003
Review URL: https://codereview.chromium.org/1886613003
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 40 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.h | 5 | ||||
-rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 8 |
3 files changed, 3 insertions, 50 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index af5955014a..4f09ebae00 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -1342,8 +1342,7 @@ bool GrGLGpu::uploadTexData(const GrSurfaceDesc& desc, bool succeeded = true; if (kNewTexture_UploadType == uploadType && 0 == left && 0 == top && - desc.fWidth == width && desc.fHeight == height && - !desc.fTextureStorageAllocator.fAllocateTextureStorage) { + desc.fWidth == width && desc.fHeight == height) { succeeded = allocate_and_populate_uncompressed_texture(desc, *interface, caps, target, internalFormat, externalFormat, externalType, texelsShallowCopy, @@ -1863,10 +1862,6 @@ int GrGLGpu::getCompatibleStencilIndex(GrPixelConfig config) { bool GrGLGpu::createTextureImpl(const GrSurfaceDesc& desc, GrGLTextureInfo* info, bool renderTarget, GrGLTexture::TexParams* initialTexParams, const SkTArray<GrMipLevel>& texels) { - if (desc.fTextureStorageAllocator.fAllocateTextureStorage) { - return this->createTextureExternalAllocatorImpl(desc, info, texels); - } - info->fID = 0; info->fTarget = GR_GL_TEXTURE_2D; GL_CALL(GenTextures(1, &(info->fID))); @@ -1897,39 +1892,6 @@ bool GrGLGpu::createTextureImpl(const GrSurfaceDesc& desc, GrGLTextureInfo* info return true; } -bool GrGLGpu::createTextureExternalAllocatorImpl(const GrSurfaceDesc& desc, - GrGLTextureInfo* info, - const SkTArray<GrMipLevel>& texels) { - // We do not make SkTArray available outside of Skia, - // and so we do not want to allow mipmaps to external - // allocators just yet. - SkASSERT(texels.count() < 2); - - const void* pixels = nullptr; - if (!texels.empty()) { - pixels = texels.begin()->fPixels; - } - switch (desc.fTextureStorageAllocator.fAllocateTextureStorage( - desc.fTextureStorageAllocator.fCtx, reinterpret_cast<GrBackendObject>(info), - desc.fWidth, desc.fHeight, desc.fConfig, pixels, desc.fOrigin)) { - case GrTextureStorageAllocator::Result::kSucceededAndUploaded: - return true; - case GrTextureStorageAllocator::Result::kFailed: - return false; - case GrTextureStorageAllocator::Result::kSucceededWithoutUpload: - break; - } - - if (!this->uploadTexData(desc, info->fTarget, kNewTexture_UploadType, 0, 0, - desc.fWidth, desc.fHeight, - desc.fConfig, texels)) { - desc.fTextureStorageAllocator.fDeallocateTextureStorage( - desc.fTextureStorageAllocator.fCtx, reinterpret_cast<GrBackendObject>(info)); - return false; - } - return true; -} - GrStencilAttachment* GrGLGpu::createStencilAttachmentForRenderTarget(const GrRenderTarget* rt, int width, int height) { diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index c8b5d70f1b..738d046450 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -141,8 +141,7 @@ private: // compatible stencil format, or negative if there is no compatible stencil format. int getCompatibleStencilIndex(GrPixelConfig config); - // If |desc.fTextureStorageAllocator| exists, use that to create the - // texture. Otherwise, create the texture directly. + // Returns whether the texture is successfully created. On success, the // result is stored in |info|. // The texture is populated with |texels|, if it exists. @@ -150,8 +149,6 @@ private: bool createTextureImpl(const GrSurfaceDesc& desc, GrGLTextureInfo* info, bool renderTarget, GrGLTexture::TexParams* initialTexParams, const SkTArray<GrMipLevel>& texels); - bool createTextureExternalAllocatorImpl(const GrSurfaceDesc& desc, GrGLTextureInfo* info, - const SkTArray<GrMipLevel>& texels); void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override; diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index aff91ebe22..ea02274ad7 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -58,13 +58,7 @@ void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) { void GrGLTexture::onRelease() { if (fInfo.fID) { if (GrGpuResource::kBorrowed_LifeCycle != fTextureIDLifecycle) { - if (this->desc().fTextureStorageAllocator.fDeallocateTextureStorage) { - this->desc().fTextureStorageAllocator.fDeallocateTextureStorage( - this->desc().fTextureStorageAllocator.fCtx, - reinterpret_cast<GrBackendObject>(&fInfo)); - } else { - GL_CALL(DeleteTextures(1, &fInfo.fID)); - } + GL_CALL(DeleteTextures(1, &fInfo.fID)); } fInfo.fID = 0; } |