Add support for all compressed formats in KTX file format

third_party/ktx/ktx.h

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkKTXFile_DEFINED
 #define SkKTXFile_DEFINED
 
 #include "SkData.h"
+#include "SkTextureCompressor.h"
 #include "SkTypes.h"
 #include "SkTDArray.h"
 #include "SkString.h"
 #include "SkRefCnt.h"
 
 class SkBitmap;
 class SkStreamRewindable;
 class SkWStream;
 
 // KTX Image File
@@ skipping 27 matching lines @@
         return this->valid() ? fPixelData[mipmap].data() : NULL;
     }
 
     // If the decoded KTX file has the following key, then it will
     // return the associated value. If not found, the empty string
     // is returned.
     SkString getValueForKey(const SkString& key) const;
 
     int numMipmaps() const { return static_cast<int>(fHeader.fNumberOfMipmapLevels); }
 
-    bool isETC1() const;
+    bool isCompressedFormat(SkTextureCompressor::Format fmt) const;
     bool isRGBA8() const;
     bool isRGB8() const;
 
     static bool is_ktx(const uint8_t *data);
     static bool is_ktx(SkStreamRewindable* stream);
 
     static bool WriteETC1ToKTX(SkWStream* stream, const uint8_t *etc1Data,
                                uint32_t width, uint32_t height);
     static bool WriteBitmapToKTX(SkWStream* stream, const SkBitmap& bitmap);
 private:
@@ skipping 63 matching lines @@
     // If the endianness of the platform is different than the file,
     // then we need to do proper byte swapping.
     bool fSwapBytes;
 
     // Read an integer from a buffer, advance the buffer, and swap
     // bytes if fSwapBytes is set
     uint32_t readInt(const uint8_t** buf, size_t* bytesLeft) const;
 };
 
 #endif  // SkKTXFile_DEFINED