Revert "Remove compressed (ETC1) texture support from Ganesh"
authorBrian Osman <brianosman@google.com>
Mon, 22 May 2017 20:14:41 +0000 (20:14 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 22 May 2017 20:14:50 +0000 (20:14 +0000)
commitbc262e110a7292950ce912e42de75b7573d0367e
tree3a5777eb2ab87791b487e3141d00c91b9749adf4
parentbcd8637772e3a678c744e28b4f4b2d42f8405284
Revert "Remove compressed (ETC1) texture support from Ganesh"

This reverts commit ee26363aaae62db2a851f2873e2405a9cf7f995a.

Reason for revert: Failing Google 3 roll.

Original change's description:
> Remove compressed (ETC1) texture support from Ganesh
>
> Change-Id: If4cf286df87ea87338aba47001d90a5fcc4f2667
> Reviewed-on: https://skia-review.googlesource.com/17456
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>

TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Ie1a57187287e03600a69e374501478e93c41415c
Reviewed-on: https://skia-review.googlesource.com/17527
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
31 files changed:
BUILD.gn
gm/etc1.cpp [new file with mode: 0644]
gn/gm.gni
include/gpu/GrCaps.h
include/gpu/GrTypes.h
src/gpu/GrCaps.cpp
src/gpu/GrDrawOpAtlas.cpp
src/gpu/GrGpu.cpp
src/gpu/GrGpu.h
src/gpu/GrResourceProvider.cpp
src/gpu/GrShaderCaps.cpp
src/gpu/GrSurface.cpp
src/gpu/GrSurfaceProxy.cpp
src/gpu/GrTexture.cpp
src/gpu/GrTextureProducer.cpp
src/gpu/SkGr.h
src/gpu/gl/GrGLCaps.cpp
src/gpu/gl/GrGLCaps.h
src/gpu/gl/GrGLGpu.cpp
src/gpu/gl/GrGLGpu.h
src/gpu/ops/GrCopySurfaceOp.cpp
src/gpu/vk/GrVkCaps.cpp
src/gpu/vk/GrVkGpu.cpp
src/gpu/vk/GrVkGpu.h
src/gpu/vk/GrVkUtil.cpp
tests/ProxyTest.cpp
third_party/etc1/LICENSE [new file with mode: 0644]
third_party/etc1/README.google [new file with mode: 0644]
third_party/etc1/etc1.cpp [new file with mode: 0644]
third_party/etc1/etc1.h [new file with mode: 0644]
tools/gpu/GrTest.cpp