share code between SkGr and Cacherator

src/core/SkImageCacherator.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapCache.h"
 #include "SkImageCacherator.h"
@@ skipping 144 matching lines @@
     SkBitmapCache::Add(fUniqueID, *bitmap);
     return check_output_bitmap(*bitmap, fUniqueID);
 #else
     return false;
 #endif
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
-static void make_texture_desc(const SkImageInfo& info, GrSurfaceDesc* desc) {
-    desc->fFlags = kNone_GrSurfaceFlags;
-    desc->fWidth = info.width();
-    desc->fHeight = info.height();
-    desc->fConfig = SkImageInfo2GrPixelConfig(info);
-    desc->fSampleCnt = 0;
-}
 
 static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrSurfaceDesc desc) {
     const void* rawStart;
     GrPixelConfig config = GrIsCompressedTextureDataSupported(ctx, data, desc.fWidth, desc.fHeight,
                                                               &rawStart);
     if (kUnknown_GrPixelConfig == config) {
         return nullptr;
     }
 
     desc.fConfig = config;
@@ skipping 40 matching lines @@
     // textures (at least the texture-key) only support 16bit dimensions, so abort early
     // if we're too big.
     if (fInfo.width() > 0xFFFF || fInfo.height() > 0xFFFF) {
         return nullptr;
     }
 
     GrUniqueKey key;
     GrMakeKeyFromImageID(&key, fUniqueID, SkIRect::MakeWH(fInfo.width(), fInfo.height()),
                          *ctx->caps(), usage);
 
-    GrSurfaceDesc desc;
-    make_texture_desc(fInfo, &desc);
-
     // 1. Check the cache for a pre-existing one
     if (GrTexture* tex = ctx->textureProvider()->findAndRefTextureByUniqueKey(key)) {
         return tex;
     }
 
     // 2. Ask the genreator to natively create one
     {
         ScopedGenerator generator(this);
         SkIRect subset = SkIRect::MakeXYWH(fOrigin.x(), fOrigin.y(), fInfo.width(), fInfo.height());
         if (GrTexture* tex = generator->generateTexture(ctx, usage, &subset)) {
             return set_key_and_return(tex, key);
         }
     }
 
+    const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo);
+
     // 3. Ask the generator to return a compressed form that the GPU might support
     SkAutoTUnref<SkData> data(this->refEncoded());
     if (data) {
         GrTexture* tex = load_compressed_into_texture(ctx, data, desc);
         if (tex) {
             return set_key_and_return(tex, key);
         }
     }
 
     // 4. Ask the generator to return YUV planes, which the GPU can convert
     {
         ScopedGenerator generator(this);
         Generator_GrYUVProvider provider(generator);
         GrTexture* tex = provider.refAsTexture(ctx, desc, true);
         if (tex) {
             return set_key_and_return(tex, key);
         }
     }
 
     // 5. Ask the generator to return RGB(A) data, which the GPU can convert
     SkBitmap bitmap;
     if (this->tryLockAsBitmap(&bitmap)) {
         return GrRefCachedBitmapTexture(ctx, bitmap, usage);
     }
 #endif
 
     return nullptr;
 }