Initial KTX file decoder

gm/etc1bitmap.cpp

Index: gm/etc1bitmap.cpp
diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp
index bb8ca6f406022a7ad0cc0947705cee30b25d0809..9312b6838a36cddd12f7d559accfe9f979b712a8 100644
--- a/gm/etc1bitmap.cpp
+++ b/gm/etc1bitmap.cpp
@@ -25,18 +25,22 @@ public:
 
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
-        return SkString("etc1bitmap");
+        SkString str = SkString("etc1bitmap_");

[robertphillips, 2014/06/02 19:56:03]

this->fileExtension ?

[krajcevski, 2014/06/02 20:01:58]

Done.

+        str.append(fileExtension());
+        return str;
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
-        return make_isize(512, 512);
+        return make_isize(128, 128);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual SkString fileExtension() const = 0;
 

[robertphillips, 2014/06/02 19:56:03]

SK_OVERRIDE ?

[krajcevski, 2014/06/02 20:01:58]

Done.

+    virtual void onDraw(SkCanvas* canvas) {
         SkBitmap bm;
         SkString filename = SkOSPath::SkPathJoin(
-                INHERITED::gResourcePath.c_str(), "mandrill_512.pkm");
+                INHERITED::gResourcePath.c_str(), "mandrill_128.");

[robertphillips, 2014/06/02 19:56:03]

this->fileExtension ?

[krajcevski, 2014/06/02 20:01:58]

Done.

+        filename.append(fileExtension());
 
         SkData *fileData = SkData::NewFromFileName(filename.c_str());
         if (NULL == fileData) {
@@ -58,8 +62,35 @@ private:
     typedef GM INHERITED;
 };
 

[robertphillips, 2014/06/02 19:56:03]

// This class specialized ETC1BitmapGM to pkm files. ?

[krajcevski, 2014/06/02 20:01:58]

Done.

+class ETC1Bitmap_PKM_GM : public ETC1BitmapGM {
+public:
+    ETC1Bitmap_PKM_GM() : ETC1BitmapGM() { }
+    virtual ~ETC1Bitmap_PKM_GM() { }
+
+protected:
+
+    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); }
+
+private:
+    typedef ETC1BitmapGM INHERITED;
+};
+

[robertphillips, 2014/06/02 19:56:03]

// This class specialized ETC1BitmapGM to ktx files. ?

[krajcevski, 2014/06/02 20:01:58]

Done.

+class ETC1Bitmap_KTX_GM : public ETC1BitmapGM {
+public:
+    ETC1Bitmap_KTX_GM() : ETC1BitmapGM() { }
+    virtual ~ETC1Bitmap_KTX_GM() { }
+
+protected:
+
+    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); }
+
+private:
+    typedef ETC1BitmapGM INHERITED;
+};
+
 }  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 
-DEF_GM( return SkNEW(skiagm::ETC1BitmapGM); )
+DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); )
+DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); )