| Index: src/gpu/SkGpuDevice.cpp
|
| diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
|
| index c5fccfc2e2c36682ddd7647432ed6efaa8767fff..f8318c52d8409fc834be2b1a636de5d3bacd31a6 100644
|
| --- a/src/gpu/SkGpuDevice.cpp
|
| +++ b/src/gpu/SkGpuDevice.cpp
|
| @@ -1034,39 +1034,10 @@ void SkGpuDevice::drawBitmapCommon(const SkDraw& draw,
|
| viewM.preConcat(m);
|
|
|
| GrTextureParams params;
|
| - SkFilterQuality paintFilterQuality = paint.getFilterQuality();
|
| - GrTextureParams::FilterMode textureFilterMode;
|
| -
|
| - bool doBicubic = false;
|
| -
|
| - switch(paintFilterQuality) {
|
| - case kNone_SkFilterQuality:
|
| - textureFilterMode = GrTextureParams::kNone_FilterMode;
|
| - break;
|
| - case kLow_SkFilterQuality:
|
| - textureFilterMode = GrTextureParams::kBilerp_FilterMode;
|
| - break;
|
| - case kMedium_SkFilterQuality:
|
| - if (viewM.getMinScale() < SK_Scalar1) {
|
| - textureFilterMode = GrTextureParams::kMipMap_FilterMode;
|
| - } else {
|
| - // Don't trigger MIP level generation unnecessarily.
|
| - textureFilterMode = GrTextureParams::kBilerp_FilterMode;
|
| - }
|
| - break;
|
| - case kHigh_SkFilterQuality:
|
| - // Minification can look bad with the bicubic effect.
|
| - doBicubic =
|
| - GrBicubicEffect::ShouldUseBicubic(viewM, &textureFilterMode);
|
| - break;
|
| - default:
|
| - SkErrorInternals::SetError( kInvalidPaint_SkError,
|
| - "Sorry, I don't understand the filtering "
|
| - "mode you asked for. Falling back to "
|
| - "MIPMaps.");
|
| - textureFilterMode = GrTextureParams::kMipMap_FilterMode;
|
| - break;
|
| - }
|
| + bool doBicubic;
|
| + GrTextureParams::FilterMode textureFilterMode =
|
| + GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), viewM, SkMatrix::I(),
|
| + &doBicubic);
|
|
|
| int tileFilterPad;
|
| if (doBicubic) {
|
|
|