Creating functions for uploading a mipmapped texture.

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGr.h"
 
 #include "GrCaps.h"
@@ skipping 628 matching lines @@
     if (result) {
         return result;
     }
 
     SkErrorInternals::SetError( kInternalError_SkError,
                                 "---- failed to create texture for cache [%d %d]\n",
                                 bitmap.width(), bitmap.height());
 
     return NULL;
 }
+
+GrTexture* GrMipmapTexture(GrContext* ctx,
+                           const SkBitmap& bitmap,
+                           SkDiscardableFactoryProc fact,
+                           const GrTextureParams* params) {
+    GrTexture* result = bitmap.getTexture();
+    // TODO: What if the bitmap already contains a non-mitmapped texture?

[scroggo, 2015/07/21 14:44:23]

non-mipmapped?

[cblume, 2015/07/21 23:07:30]

I mean what if someone calls creates a regular texture from a bitmap (this
texture does not have any extra mipmap levels). Then they call this function
passing in that same bitmap.

GrRefCachedBitmapTexture and this function both exit early if the texture was
already created. It just returns that existing texture.

But if the texture was created without any extra mipmap levels, it would be off
to exit early with a non-mipmapped texture.

+    if (result) {
+      // TODO: Add stretching. After reading get_stretch(), it appears small

[scroggo, 2015/07/21 14:44:23]

nit: this should be a four space indent

[cblume, 2015/07/21 23:07:30]

Done.

+      // textures can have issues.
+      return SkRef(result);
+    }
+
+    GrSurfaceDesc desc;
+    generate_bitmap_texture_desc(bitmap, &desc);
+
+    auto mipmap = SkMipMap::Build(bitmap, fact);
+    if (mipmap == NULL) {
+        // could not create the mipmap
+        return NULL;
+    } else {
+        return ctx->textureProvider()->createMipmappedTexture(desc, true, *mipmap);
+        // TODO: BitmapInvalidator support
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass
 // alpha info, that will be considered.
 GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProfileType pt) {
     switch (ct) {
         case kUnknown_SkColorType:
             return kUnknown_GrPixelConfig;
         case kAlpha_8_SkColorType:
             return kAlpha_8_GrPixelConfig;
@@ skipping 167 matching lines @@
     }
     return SkImageInfo::Make(w, h, ct, at);
 }
 
 
 void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque, SkBitmap* dst) {
     const SkImageInfo info = GrMakeInfoFromTexture(src, w, h, isOpaque);
     dst->setInfo(info);
     dst->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, src)))->unref();
 }