Remove image usage type enum. Use GrTextureParams instead.

tests/ReadPixelsTest.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 "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
@@ skipping 558 matching lines @@
 
     SkBitmap bitmap;
     make_ringed_bitmap(&bitmap, 6, 6);
     const SkIRect subset = SkIRect::MakeLTRB(2, 2, 4, 4);
 
     // make two textures...
     SkBitmap bm_subset, tx_subset;
 
     // ... one from a texture-subset
     SkAutoTUnref<GrTexture> fullTx(GrRefCachedBitmapTexture(ctx, bitmap,
-                                                            kUntiled_SkImageUsageType));
+                                                            GrTextureParams::ClampNoFilter()));
     SkBitmap tx_full;
     GrWrapTextureInBitmap(fullTx, bitmap.width(), bitmap.height(), true, &tx_full);
     tx_full.extractSubset(&tx_subset, subset);
 
     // ... one from a bitmap-subset
     SkBitmap tmp_subset;
     bitmap.extractSubset(&tmp_subset, subset);
     SkAutoTUnref<GrTexture> subsetTx(GrRefCachedBitmapTexture(ctx, tmp_subset,
-                                                              kUntiled_SkImageUsageType));
+                                                              GrTextureParams::ClampNoFilter()));
     GrWrapTextureInBitmap(subsetTx, tmp_subset.width(), tmp_subset.height(), true, &bm_subset);
 
     // did we get the same subset?
     compare_textures(reporter, bm_subset.getTexture(), tx_subset.getTexture());
 
     // do they draw the same?
     const SkImageInfo info = SkImageInfo::MakeN32Premul(128, 128);
     SkAutoTUnref<SkSurface> surfA(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info, 0));
     SkAutoTUnref<SkSurface> surfB(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info, 0));
 
     if (false) {
         //
         //  BUG: depending on the driver, if we calls this with various quality settings, it
         //       may fail.
         //
         SkFilterQuality quality = kLow_SkFilterQuality;
 
         SkAutoTUnref<SkData> dataA(draw_into_surface(surfA, bm_subset, quality));
         SkAutoTUnref<SkData> dataB(draw_into_surface(surfB, tx_subset, quality));
 
         REPORTER_ASSERT(reporter, dataA->equals(dataB));
         if (false) {
             dump_to_file("test_image_A.png", dataA);
             dump_to_file("test_image_B.png", dataB);
         }
     }
 }
 #endif