diff options
| author |  egdaniel <egdaniel@google.com> | 2015-03-27 12:22:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-27 12:22:10 -0700 |
| commit | d588c01c7e48663d6d61686e47daf63b9b0b3d12 (patch) | |
| tree | 2423ceddb20fab8f9409614309cf96e1b9bdbaa9 /third_party | |
| parent | 573ae01295241c156ff8548ded283d44864d22d2 (diff) | |
Housekeeping to rename GrGL compressed texture formats to match GL specs
BUG=skia:
Review URL: https://codereview.chromium.org/1035243002
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ktx/ktx.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/third_party/ktx/ktx.cpp b/third_party/ktx/ktx.cpp index 42b3ca119f..5e24581c62 100644 --- a/third_party/ktx/ktx.cpp +++ b/third_party/ktx/ktx.cpp @@ -18,23 +18,23 @@ static inline uint32_t compressed_fmt_to_gl_define(SkTextureCompressor::Format fmt) { static const uint32_t kGLDefineMap[SkTextureCompressor::kFormatCnt] = { - GR_GL_COMPRESSED_LUMINANCE_LATC1, // kLATC_Format - GR_GL_COMPRESSED_R11, // kR11_EAC_Format - GR_GL_COMPRESSED_RGB8_ETC1, // kETC1_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_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_STATIC_ASSERT(0 == SkTextureCompressor::kLATC_Format); @@ -385,7 +385,7 @@ bool SkKTXFile::WriteETC1ToKTX(SkWStream* stream, const uint8_t *etc1Data, hdr.fGLType = 0; hdr.fGLTypeSize = 1; hdr.fGLFormat = 0; - hdr.fGLInternalFormat = GR_GL_COMPRESSED_RGB8_ETC1; + hdr.fGLInternalFormat = GR_GL_COMPRESSED_ETC1_RGB8; hdr.fGLBaseInternalFormat = GR_GL_RGB; hdr.fPixelWidth = width; hdr.fPixelHeight = height; |