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

src/effects/SkBlurMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
@@ skipping 732 matching lines @@
                                  const GrProcessor& proc) {
     const GrRectBlurEffect& rbe = proc.cast<GrRectBlurEffect>();
     SkRect rect = rbe.getRect();
 
     pdman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
     pdman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
 }
 
 bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma,
                                                 GrTexture **blurProfileTexture) {
-    GrTextureParams params;
     GrSurfaceDesc texDesc;
 
     unsigned int profileSize = SkScalarCeilToInt(6*sigma);
 
     texDesc.fWidth = profileSize;
     texDesc.fHeight = 1;
     texDesc.fConfig = kAlpha_8_GrPixelConfig;
 
     static const GrContentKey::Domain kDomain = GrContentKey::GenerateDomain();
     GrContentKey key;
     GrContentKey::Builder builder(&key, kDomain, 1);
     builder[0] = profileSize;
     builder.finish();
 
     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;
 }
 
 GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma,
                                    GrTexture *blur_profile)
   : fRect(rect),
     fSigma(sigma),
     fBlurProfileAccess(blur_profile) {
@@ skipping 125 matching lines @@
         return NULL;
     }
 
     static const GrContentKey::Domain kDomain = GrContentKey::GenerateDomain();
     GrContentKey key;
     GrContentKey::Builder builder(&key, kDomain, 2);
     builder[0] = blurRadius;
     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;
     texDesc.fWidth = texSide;
     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;
 
         mask.fBounds = SkIRect::MakeWH(smallRectSide, smallRectSide);
         mask.fFormat = SkMask::kA8_Format;
         mask.fRowBytes = mask.fBounds.width();
         mask.fImage = SkMask::AllocImage(mask.computeTotalImageSize());
         SkAutoMaskFreeImage amfi(mask.fImage);
 
         memset(mask.fImage, 0, mask.computeTotalImageSize());
 
         SkRect smallRect;
         smallRect.setWH(SkIntToScalar(smallRectSide), SkIntToScalar(smallRectSide));
 
         SkRRect smallRRect;
         smallRRect.setRectXY(smallRect, SkIntToScalar(cornerRadius), SkIntToScalar(cornerRadius));
 
         SkPath path;
         path.addRRect( smallRRect );
 

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

2 overlength lines

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

Done.

         SkDraw::DrawToMask(path, &mask.fBounds, NULL, NULL, &mask, SkMask::kJustRenderImage_CreateMode, SkPaint::kFill_Style);
 
         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);
     }
 
     SkAutoTUnref<GrTexture> blurunref(blurNinePatchTexture);
     if (NULL == blurNinePatchTexture) {
         return NULL;
     }
 
     return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture));
 }
@@ skipping 289 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END