| Index: include/gpu/SkGr.h
|
| diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
|
| index aacc5d25db20f40815d5ed6278058306e12c318b..6a73636c69047e26e70dbcd39127f378bd88c658 100644
|
| --- a/include/gpu/SkGr.h
|
| +++ b/include/gpu/SkGr.h
|
| @@ -15,6 +15,7 @@
|
| #include "SkFilterQuality.h"
|
| #include "SkImageInfo.h"
|
|
|
| +class GrCaps;
|
| class GrContext;
|
| class GrTexture;
|
| class GrTextureParams;
|
| @@ -70,10 +71,10 @@ static inline GrColor SkPMColorToGrColor(SkPMColor c) {
|
| GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&);
|
|
|
| // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses).
|
| -GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType);
|
| +GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType, const GrCaps&);
|
|
|
| -static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) {
|
| - return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType());
|
| +static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& caps) {
|
| + return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType(), caps);
|
| }
|
|
|
| GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality,
|
|
|