make the filter mode for GrTextureAccess an enum so we can plumb down

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 3951d919e62f73939977a9c09beb6ba73d7c521b..72ecc59246537ca517e15b6e3d1e58670239ea4f 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -306,7 +306,7 @@ GrTexture* GrContext::createResizedTexture(const GrTextureDesc& desc,
                                            const GrCacheID& cacheID,
                                            void* srcData,
                                            size_t rowBytes,
-                                           bool needsFiltering) {
+                                           GrTextureParams::FilterMode filterMode) {
     SkAutoTUnref<GrTexture> clampedTexture(this->findAndRefTexture(desc, cacheID, NULL));
     if (NULL == clampedTexture) {
         clampedTexture.reset(this->createTexture(NULL, desc, cacheID, srcData, rowBytes));
@@ -333,7 +333,7 @@ GrTexture* GrContext::createResizedTexture(const GrTextureDesc& desc,
         // if filtering is not desired then we want to ensure all
         // texels in the resampled image are copies of texels from
         // the original.
-        GrTextureParams params(SkShader::kClamp_TileMode, needsFiltering);
+        GrTextureParams params(SkShader::kClamp_TileMode, filterMode);

[bsalomon, 2013/07/25 17:41:48]

Actually I think we just want to set knone or kbilerp here..

Unextended ES2 doesn't allow NPOT textures to be used with mip filtering or wrap
modes other than clamp.

This function will stretch the base level of a NPOT texture to the next POT so
that it can be used with wrap modes or mipmaps.

We do a non-bilerp stretch when the caller asked for an unfiltered draw. This
means that the stretched texture only has pixel values that were present in the
original bitmap. Whether the stretch was bilerped or not is recorded in the key
for the stretched texture so that we one when the caller asks for no filtering
and the other with filtering. I think the filtered stretched version could be
used for both the mip and bilerp cases.

Maybe we should go back to having a bool for NeedsFiltering() and just rename it
to NeedsFilteringOrMips().

This whole thing is of decreasing relevance as all the newer GPUs support the
extension that removes the limitations on NPOT.

         drawState->addColorTextureEffect(clampedTexture, SkMatrix::I(), params);
 
         drawState->setVertexAttribs<gVertexAttribs>(SK_ARRAY_COUNT(gVertexAttribs));
@@ -382,9 +382,15 @@ GrTexture* GrContext::createTexture(const GrTextureParams* params,
 
     GrTexture* texture;
     if (GrTexture::NeedsResizing(resourceKey)) {
+        GrTextureParams::FilterMode textureFilterMode = GrTextureParams::kNone_FilterMode;
+        if (GrTexture::NeedsBilerp(resourceKey)) {
+            textureFilterMode = GrTextureParams::kBilerp_FilterMode;
+        } else if (GrTexture::NeedsMipMap(resourceKey)) {
+            textureFilterMode = GrTextureParams::kMipMap_FilterMode;
+        }
         texture = this->createResizedTexture(desc, cacheID,
                                              srcData, rowBytes,
-                                             GrTexture::NeedsFiltering(resourceKey));
+                                             textureFilterMode);
     } else {
         texture= fGpu->createTexture(desc, srcData, rowBytes);
     }