Move npot resizing out of GrContext and simplify GrContext texture functions.

src/effects/SkBlurMaskFilter.cpp

Index: src/effects/SkBlurMaskFilter.cpp
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 3487ae40b49af51ebc8ccf3d01dcbea2e839b92b..0821f52ba8430b998adf382b4c17f1c5e3703a44 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -750,7 +750,6 @@ void GrGLRectBlurEffect::setData(const GrGLProgramDataManager& pdman,
 
 bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma,
                                                 GrTexture **blurProfileTexture) {
-    GrTextureParams params;
     GrSurfaceDesc texDesc;
 
     unsigned int profileSize = SkScalarCeilToInt(6*sigma);
@@ -768,18 +767,19 @@ bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma,
     uint8_t *profile = NULL;
     SkAutoTDeleteArray<uint8_t> ada(NULL);
 
-    *blurProfileTexture = context->findAndRefTexture(texDesc, key, &params);
+    *blurProfileTexture = context->findAndRefCachedTexture(key);
 
     if (NULL == *blurProfileTexture) {
 
         SkBlurMask::ComputeBlurProfile(sigma, &profile);
         ada.reset(profile);
 
-        *blurProfileTexture = context->createTexture(&params, texDesc, key, profile, 0);
+        *blurProfileTexture = context->createTexture(texDesc, profile, 0);
 
         if (NULL == *blurProfileTexture) {
             return false;
         }
+        SkAssertResult(context->addResourceToCache(key, *blurProfileTexture));
     }
 
     return true;
@@ -925,9 +925,6 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma,
     builder[1] = cornerRadius;
     builder.finish();
 
-    GrTextureParams params;
-    params.setFilterMode(GrTextureParams::kBilerp_FilterMode);
-
     unsigned int smallRectSide = 2*(blurRadius + cornerRadius) + 1;
     unsigned int texSide = smallRectSide + 2*blurRadius;

[robertphillips, 2015/01/30 14:47:21]

I guess we could move the creation of 'texDesc' down closer to its use in
createTexture.

[bsalomon, 2015/01/30 15:37:39]

Done.

     GrSurfaceDesc texDesc;
@@ -935,7 +932,7 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma,
     texDesc.fHeight = texSide;
     texDesc.fConfig = kAlpha_8_GrPixelConfig;
 
-    GrTexture *blurNinePatchTexture = context->findAndRefTexture(texDesc, key, &params);
+    GrTexture *blurNinePatchTexture = context->findAndRefCachedTexture(key);
 
     if (NULL == blurNinePatchTexture) {
         SkMask mask;
@@ -962,7 +959,9 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma,
         SkMask blurred_mask;
         SkBlurMask::BoxBlur(&blurred_mask, mask, sigma, kNormal_SkBlurStyle, kHigh_SkBlurQuality, NULL, true );
 
-        blurNinePatchTexture = context->createTexture(&params, texDesc, key, blurred_mask.fImage, 0);
+        blurNinePatchTexture = context->createTexture(texDesc, blurred_mask.fImage, 0);
+        SkAssertResult(context->addResourceToCache(key, blurNinePatchTexture));
+
         SkMask::FreeImage(blurred_mask.fImage);
     }