Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU bu…

src/gpu/GrImageIDTextureAdjuster.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrImageIDTextureAdjuster.h"
 
 #include "GrContext.h"
@@ skipping 64 matching lines @@
     SkASSERT(!bitmap.getTexture());
     if (!bitmap.isVolatile()) {
         SkIPoint origin = bitmap.pixelRefOrigin();
         SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
                                            bitmap.height());
         GrMakeKeyFromImageID(&fOriginalKey, bitmap.pixelRef()->getGenerationID(), subset);
     }
 }
 
 GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped) {
-    GrTexture* tex;
+    GrTexture* tex = nullptr;
 
     if (fOriginalKey.isValid()) {
         tex = this->context()->textureProvider()->findAndRefTextureByUniqueKey(fOriginalKey);
         if (tex) {
             return tex;
         }
     }
-    // disable mipmapping until we generate anisotropic mipmap levels
-    willBeMipped = false;
     if (willBeMipped) {
         tex = GrGenerateMipMapsAndUploadToTexture(this->context(), fBitmap);
-    } else {
+    }
+    if (!tex) {
         tex = GrUploadBitmapToTexture(this->context(), fBitmap);
     }
     if (tex && fOriginalKey.isValid()) {
         tex->resourcePriv().setUniqueKey(fOriginalKey);
         GrInstallBitmapUniqueKeyInvalidator(fOriginalKey, fBitmap.pixelRef());
     }
     return tex;
 }
 
 void GrBitmapTextureMaker::makeCopyKey(const CopyParams& copyParams, GrUniqueKey* copyKey) {
@@ skipping 31 matching lines @@
     if (fOriginalKey.isValid() && SkImage::kAllow_CachingHint == fCachingHint) {
         MakeCopyKeyFromOrigKey(fOriginalKey, stretch, paramsCopyKey);
     }
 }
 
 void GrImageTextureMaker::didCacheCopy(const GrUniqueKey& copyKey) {
     if (fClient) {
         as_IB(fClient)->notifyAddedToCache();
     }
 }