From 999cfd1076e23e7348623f7a59cf2905bdc6099d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 30 May 2014 20:36:21 +0000 Subject: Revert of Initial work to get ETC1 data up to the GPU (https://codereview.chromium.org/302783002/) Reason for revert: ETC1 linking problems with chrome. Original issue's description: > Initial work to get ETC1 data up to the GPU > > Committed: http://code.google.com/p/skia/source/detail?r=15001 R=bsalomon@google.com, robertphillips@google.com TBR=bsalomon@google.com, robertphillips@google.com NOTREECHECKS=true NOTRY=true Author: krajcevski@google.com Review URL: https://codereview.chromium.org/303273008 git-svn-id: http://skia.googlecode.com/svn/trunk@15004 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrContext.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/gpu/GrContext.cpp') diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 66588c46bc..5a59bc17fd 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -388,14 +388,11 @@ GrTexture* GrContext::createTexture(const GrTextureParams* params, GrTexture* texture; if (GrTextureImpl::NeedsResizing(resourceKey)) { - // We do not know how to resize compressed textures. - SkASSERT(!GrPixelConfigIsCompressed(desc.fConfig)); - texture = this->createResizedTexture(desc, cacheID, srcData, rowBytes, GrTextureImpl::NeedsBilerp(resourceKey)); } else { - texture = fGpu->createTexture(desc, srcData, rowBytes); + texture= fGpu->createTexture(desc, srcData, rowBytes); } if (NULL != texture) { -- cgit v1.2.3