Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what…

include/gpu/SkGr.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGr_DEFINED
 #define SkGr_DEFINED
@@ skipping 47 matching lines @@
     GrColorIsPMAssert(c);
     return SkPackARGB32(GrColorUnpackA(c), GrColorUnpackR(c), GrColorUnpackG(c), GrColorUnpackB(c));
 }
 
 static inline GrColor SkPMColorToGrColor(SkPMColor c) {
     return GrColorPackRGBA(SkGetPackedR32(c), SkGetPackedG32(c), SkGetPackedB32(c),
                            SkGetPackedA32(c));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+/** Returns a texture representing the bitmap that is compatible with the GrTextureParams */

[reed1, 2015/10/16 19:23:42]

I presume the texture has already been "cached", as the name implies?

[bsalomon, 2015/10/16 20:09:45]

Yup, will update the comment.

+GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&);
 
-GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&);
-    
 // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses).
 GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType);
 
 static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) {
     return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType());
 }
 
 GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality,
                                                             const SkMatrix& viewM,
                                                             const SkMatrix& localM,
                                                             bool* doBicubic);
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque);
 
 // Using the dreaded SkGrPixelRef ...
 SK_API void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque,
                                   SkBitmap* dst);
 
 #endif