Add NPOT version of tilemodes GM

gm/tilemodes.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkPath.h"
 #include "SkRegion.h"
@@ skipping 36 matching lines @@
                   SkShader::TileMode tmx, SkShader::TileMode tmy) {
     SkShader* shader = SkShader::CreateBitmapShader(bm, tmx, tmy);
     paint->setShader(shader)->unref();
     paint->setFilterBitmap(filter);
 }
 
 static const SkBitmap::Config gConfigs[] = {
     SkBitmap::kARGB_8888_Config,
     SkBitmap::kRGB_565_Config,
 };
-static const int gWidth = 32;
-static const int gHeight = 32;
 
 class TilingGM : public skiagm::GM {
     SkBlurDrawLooper    fLooper;
 public:
-    TilingGM()
-            : fLooper(SkIntToScalar(1), SkIntToScalar(2), SkIntToScalar(2),
-                      0x88000000) {
+    TilingGM(bool powerOfTwoSize)
+            : fLooper(SkIntToScalar(1), SkIntToScalar(2), SkIntToScalar(2), 0x88000000)
+            , fPowerOfTwoSize(powerOfTwoSize) {
     }
 
     SkBitmap    fTexture[SK_ARRAY_COUNT(gConfigs)];
 
 protected:
+
+    enum {
+        kPOTSize = 32,
+        kNPOTSize = 21,
+    };
+
     SkString onShortName() {
-        return SkString("tilemodes");
+        SkString name("tilemodes");
+        if (!fPowerOfTwoSize) {
+            name.append("_npot");
+        }
+        return name;
     }
 
     SkISize onISize() { return SkISize::Make(880, 560); }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
+        int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
         for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); i++) {
-            makebm(&fTexture[i], gConfigs[i], gWidth, gHeight);
+            makebm(&fTexture[i], gConfigs[i], size, size);
         }
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
-        SkRect r = { 0, 0, SkIntToScalar(gWidth*2), SkIntToScalar(gHeight*2) };
+        int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
+
+        SkRect r = { 0, 0, SkIntToScalar(size*2), SkIntToScalar(size*2) };
 
         static const char* gConfigNames[] = { "8888", "565", "4444" };
 
         static const bool           gFilters[] = { false, true };
         static const char*          gFilterNames[] = {     "point",                     "bilinear" };
 
         static const SkShader::TileMode gModes[] = { SkShader::kClamp_TileMode, SkShader::kRepeat_TileMode, SkShader::kMirror_TileMode };
         static const char*          gModeNames[] = {    "C",                    "R",                   "M" };
 
         SkScalar y = SkIntToScalar(24);
@@ skipping 42 matching lines @@
                     str.printf("%s, %s", gConfigNames[i], gFilterNames[j]);
                     canvas->drawText(str.c_str(), str.size(), x, y + r.height() * 2 / 3, p);
                 }
 
                 y += r.height() * 4 / 3;
             }
         }
     }
 
 private:
+    bool fPowerOfTwoSize;
     typedef skiagm::GM INHERITED;
 };
 
+static const int gWidth = 32;
+static const int gHeight = 32;
+
 static SkShader* make_bm(SkShader::TileMode tx, SkShader::TileMode ty) {
     SkBitmap bm;
     makebm(&bm, SkBitmap::kARGB_8888_Config, gWidth, gHeight);
     return SkShader::CreateBitmapShader(bm, tx, ty);
 }
 
 static SkShader* make_grad(SkShader::TileMode tx, SkShader::TileMode ty) {
     SkPoint pts[] = { { 0, 0 }, { SkIntToScalar(gWidth), SkIntToScalar(gHeight)} };
     SkPoint center = { SkIntToScalar(gWidth)/2, SkIntToScalar(gHeight)/2 };
     SkScalar rad = SkIntToScalar(gWidth)/2;
@@ skipping 80 matching lines @@
             y += r.height() * 4 / 3;
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-DEF_GM( return new TilingGM; )
+DEF_GM( return new TilingGM(true); )
+DEF_GM( return new TilingGM(false); )
 DEF_GM( return new Tiling2GM(make_bm, "bitmap"); )
 DEF_GM( return new Tiling2GM(make_grad, "gradient"); )