| Index: third_party/ktx/ktx.cpp
|
| diff --git a/third_party/ktx/ktx.cpp b/third_party/ktx/ktx.cpp
|
| index 5e24581c62763d31c63228be8599542bc145f7d6..f7451e822e4279fb2453e28e7c58d75e64d9307b 100644
|
| --- a/third_party/ktx/ktx.cpp
|
| +++ b/third_party/ktx/ktx.cpp
|
| @@ -21,20 +21,20 @@ static inline uint32_t compressed_fmt_to_gl_define(SkTextureCompressor::Format f
|
| GR_GL_COMPRESSED_LUMINANCE_LATC1, // kLATC_Format
|
| GR_GL_COMPRESSED_R11_EAC, // kR11_EAC_Format
|
| GR_GL_COMPRESSED_ETC1_RGB8, // kETC1_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_4x4_KHR, // kASTC_4x4_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_5x4_KHR, // kASTC_5x4_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_5x5_KHR, // kASTC_5x5_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_6x5_KHR, // kASTC_6x5_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_6x6_KHR, // kASTC_6x6_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_8x5_KHR, // kASTC_8x5_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_8x6_KHR, // kASTC_8x6_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_8x8_KHR, // kASTC_8x8_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_10x5_KHR, // kASTC_10x5_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_10x6_KHR, // kASTC_10x6_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_10x8_KHR, // kASTC_10x8_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_10x10_KHR, // kASTC_10x10_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_12x10_KHR, // kASTC_12x10_Format
|
| - GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR, // kASTC_12x12_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_4x4, // kASTC_4x4_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_5x4, // kASTC_5x4_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_5x5, // kASTC_5x5_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_6x5, // kASTC_6x5_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_6x6, // kASTC_6x6_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_8x5, // kASTC_8x5_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_8x6, // kASTC_8x6_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_8x8, // kASTC_8x8_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_10x5, // kASTC_10x5_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_10x6, // kASTC_10x6_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_10x8, // kASTC_10x8_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_10x10, // kASTC_10x10_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_12x10, // kASTC_12x10_Format
|
| + GR_GL_COMPRESSED_RGBA_ASTC_12x12, // kASTC_12x12_Format
|
| };
|
|
|
| GR_STATIC_ASSERT(0 == SkTextureCompressor::kLATC_Format);
|
|
|