diff options
| author |  krajcevski <krajcevski@google.com> | 2014-08-04 09:47:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-04 09:47:32 -0700 |
| commit | 50495571df39ac3300c113ae5b0f607a8d7e59da (patch) | |
| tree | 3766fc3a930c560ee0e6f12019b238df671b8581 /src/gpu/GrSWMaskHelper.cpp | |
| parent | 80bddedbb11307a8e209a23d7940dfb5cba00feb (diff) | |
Revert of Add ETC1 format to SkTextureCompressor (https://codereview.chromium.org/432143002/)
Reason for revert:
Breaking Chrome.
Original issue's description:
> Add ETC1 format to SkTextureCompressor
>
> Committed: https://skia.googlesource.com/skia/+/5d8b1b44ea7636fc8e98247cb311568f277ce3a5
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/438443004
Diffstat (limited to 'src/gpu/GrSWMaskHelper.cpp')
| -rw-r--r-- | src/gpu/GrSWMaskHelper.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp index 744fa1db8f..be6eb034b4 100644 --- a/src/gpu/GrSWMaskHelper.cpp +++ b/src/gpu/GrSWMaskHelper.cpp @@ -40,13 +40,11 @@ static inline GrPixelConfig fmt_to_config(SkTextureCompressor::Format fmt) { static const GrPixelConfig configMap[] = { kLATC_GrPixelConfig, // kLATC_Format, kR11_EAC_GrPixelConfig, // kR11_EAC_Format, - kETC1_GrPixelConfig, // kETC1_Format, kASTC_12x12_GrPixelConfig // kASTC_12x12_Format, }; GR_STATIC_ASSERT(0 == SkTextureCompressor::kLATC_Format); GR_STATIC_ASSERT(1 == SkTextureCompressor::kR11_EAC_Format); - GR_STATIC_ASSERT(2 == SkTextureCompressor::kETC1_Format); - GR_STATIC_ASSERT(3 == SkTextureCompressor::kASTC_12x12_Format); + GR_STATIC_ASSERT(2 == SkTextureCompressor::kASTC_12x12_Format); GR_STATIC_ASSERT(SK_ARRAY_COUNT(configMap) == SkTextureCompressor::kFormatCnt); return configMap[fmt]; |