Allow max tile size to be overridden separately from max texture size.

gm/bleed.cpp

 /*
  * Copyright 2013 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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 197 matching lines @@
     SkISize onISize() override {
         return SkISize::Make(1050, 780);
     }
 
     void onOnceBeforeDraw() override {
         gBleedRec[fBT].fBmpMaker(&fBitmapSmall, kSmallTextureSize, kSmallTextureSize);
         fImageSmall.reset(SkImage::NewFromBitmap(fBitmapSmall));
 
         // To exercise the GPU's tiling path we need a texture
         // too big for the GPU to handle in one go
-        gBleedRec[fBT].fBmpMaker(&fBitmapBig, 2*kMaxTextureSize, 2*kMaxTextureSize);
+        gBleedRec[fBT].fBmpMaker(&fBitmapBig, 2*kMaxTileSize, 2*kMaxTileSize);
         fImageBig.reset(SkImage::NewFromBitmap(fBitmapBig));
 
         fShader.reset(gBleedRec[fBT].fShaderMaker());
     }
 
     // Draw only the center of the small bitmap
     void drawCase1(SkCanvas* canvas, int transX, int transY, bool aa,
                    SkCanvas::SrcRectConstraint constraint, SkFilterQuality filter) {
         SkRect src = SkRect::MakeXYWH(2, 2,
                                       SkIntToScalar(kSmallTextureSize-4),
@@ skipping 142 matching lines @@
                                                  SkTMax(corners[2].fX, corners[3].fX));
                 maxX = SkTMax(maxX, x);
                 canvas->restore();
             }
             canvas->restore();
         }
     }
 
 #if SK_SUPPORT_GPU
     void modifyGrContextOptions(GrContextOptions* options) override {
-        options->fMaxTextureSizeOverride = kMaxTextureSize;
+        options->fMaxTileSizeOverride = kMaxTileSize;
     }
 #endif
 
 private:
     static const int kBlockSize = 70;
     static const int kBlockSpacing = 5;
 
     static const int kCol0X = kBlockSpacing;
     static const int kCol1X = 2*kBlockSpacing + kBlockSize;
     static const int kCol2X = 3*kBlockSpacing + 2*kBlockSize;
     static const int kCol3X = 4*kBlockSpacing + 3*kBlockSize;
     static const int kCol4X = 5*kBlockSpacing + 4*kBlockSize;
     static const int kCol5X = 6*kBlockSpacing + 5*kBlockSize;
     static const int kWidth = 7*kBlockSpacing + 6*kBlockSize;
 
     static const int kRow0Y = kBlockSpacing;
     static const int kRow1Y = 2*kBlockSpacing + kBlockSize;
     static const int kRow2Y = 3*kBlockSpacing + 2*kBlockSize;
     static const int kRow3Y = 4*kBlockSpacing + 3*kBlockSize;
 
     static const int kSmallTextureSize = 6;
-    static const int kMaxTextureSize = 32;
+    static const int kMaxTileSize = 32;
 
     SkBitmap fBitmapSmall;
     SkBitmap fBitmapBig;
     SkAutoTUnref<SkImage> fImageSmall;
     SkAutoTUnref<SkImage> fImageBig;
 
     SkAutoTUnref<SkShader> fShader;
 
     const BleedTest fBT;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return new BleedGM(kUseBitmap_BleedTest); )
 DEF_GM( return new BleedGM(kUseImage_BleedTest); )
 DEF_GM( return new BleedGM(kUseAlphaBitmap_BleedTest); )
 DEF_GM( return new BleedGM(kUseAlphaImage_BleedTest); )
-#if 0  // Currently crashes GPU backend
 DEF_GM(return new BleedGM(kUseAlphaBitmapShader_BleedTest); )
 DEF_GM(return new BleedGM(kUseAlphaImageShader_BleedTest); )
-#endif