Add support for all compressed formats in KTX file format

third_party/ktx/ktx.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "ktx.h"
 #include "SkBitmap.h"
 #include "SkStream.h"
 #include "SkEndian.h"
 
 #include "gl/GrGLDefines.h"
+#include "GrConfig.h"
 
 #include "etc1.h"
 
+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_12x12,  // 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(SK_ARRAY_COUNT(kGLDefineMap) == SkTextureCompressor::kFormatCnt);
+
+    return kGLDefineMap[fmt];
+}
+
 #define KTX_FILE_IDENTIFIER_SIZE 12
 static const uint8_t KTX_FILE_IDENTIFIER[KTX_FILE_IDENTIFIER_SIZE] = {
     0xAB, 0x4B, 0x54, 0x58, 0x20, 0x31, 0x31, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A
 };
 
 static const uint32_t kKTX_ENDIANNESS_CODE = 0x04030201;
 
 bool SkKTXFile::KeyValue::readKeyAndValue(const uint8_t* data) {
     const char *key = reinterpret_cast<const char *>(data);
     const char *value = key;
@@ skipping 88 matching lines @@
     const KeyValue *begin = this->fKeyValuePairs.begin();
     const KeyValue *end = this->fKeyValuePairs.end();
     for (const KeyValue *kv = begin; kv != end; ++kv) {
         if (kv->key() == key) {
             return kv->value();
         }
     }
     return SkString();
 }
 
-bool SkKTXFile::isETC1() const {
-    return this->valid() && GR_GL_COMPRESSED_RGB8_ETC1 == fHeader.fGLInternalFormat;
+bool SkKTXFile::isCompressedFormat(SkTextureCompressor::Format fmt) const {
+    if (!this->valid()) {
+        return false;
+    }
+
+    // This has many aliases
+    bool isFmt = false;
+    if (fmt == SkTextureCompressor::kLATC_Format) {
+        isFmt = GR_GL_COMPRESSED_RED_RGTC1 == fHeader.fGLInternalFormat ||
+                GR_GL_COMPRESSED_3DC_X == fHeader.fGLInternalFormat;
+    }
+
+    return isFmt || compressed_fmt_to_gl_define(fmt) == fHeader.fGLInternalFormat;
 }
 
 bool SkKTXFile::isRGBA8() const {
     return this->valid() && GR_GL_RGBA8 == fHeader.fGLInternalFormat;
 }
 
 bool SkKTXFile::isRGB8() const {
     return this->valid() && GR_GL_RGB8 == fHeader.fGLInternalFormat;
 }
 
@@ skipping 352 matching lines @@
         for (int i = 0; i < height; ++i) {
             if (!stream->write(rowPtr, bpp*width)) {
                 return false;
             }
             rowPtr += bitmap.rowBytes();
         }
     }
     
     return true;
 }