aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar krajcevski <krajcevski@google.com>2014-08-04 09:08:29 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-04 09:08:29 -0700
commit5d8b1b44ea7636fc8e98247cb311568f277ce3a5 (patch)
tree36595c42c6ace701f0535927263282e028bafb50 /src/gpu
parent9dc41a5100bf7019a0327d69e130a34d1f19eabd (diff)
Add ETC1 format to SkTextureCompressor
R=robertphillips@google.com Author: krajcevski@google.com Review URL: https://codereview.chromium.org/432143002
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrSWMaskHelper.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index be6eb034b4..744fa1db8f 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -40,11 +40,13 @@ 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::kASTC_12x12_Format);
+ GR_STATIC_ASSERT(2 == SkTextureCompressor::kETC1_Format);
+ GR_STATIC_ASSERT(3 == SkTextureCompressor::kASTC_12x12_Format);
GR_STATIC_ASSERT(SK_ARRAY_COUNT(configMap) == SkTextureCompressor::kFormatCnt);
return configMap[fmt];