Creating functions for uploading a mipmapped texture.

include/gpu/GrContext.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContext_DEFINED
 #define GrContext_DEFINED
 
 #include "GrClip.h"
 #include "GrColor.h"
 #include "GrPaint.h"
 #include "GrPathRendererChain.h"
 #include "GrRenderTarget.h"
 #include "GrTextureProvider.h"
 #include "SkMatrix.h"
 #include "SkMutex.h"
+#include "SkMipMapLevel.h"
 #include "SkPathEffect.h"
+#include "SkTArray.h"
 #include "SkTypes.h"
 
 struct GrBatchAtlasConfig;
 class GrBatchFontCache;
 class GrCaps;
 struct GrContextOptions;
 class GrDrawContext;
 class GrDrawTarget;
 class GrFragmentProcessor;
 class GrGpu;
@@ skipping 221 matching lines @@
                            uint32_t pixelOpsFlags = 0);
 
     /**
      * Writes a rectangle of pixels to a surface.
      * @param surface       the surface to write to.
      * @param left          left edge of the rectangle to write (inclusive)
      * @param top           top edge of the rectangle to write (inclusive)
      * @param width         width of rectangle to write in pixels.
      * @param height        height of rectangle to write in pixels.
      * @param config        the pixel config of the source buffer
-     * @param buffer        memory to read pixels from
-     * @param rowBytes      number of bytes between consecutive rows. Zero
-     *                      means rows are tightly packed.
+     * @param texels        array of mipmap levels containing texel data to load.
+     *                      Begins with full-sized palette data for paletted textures.
+     *                      For compressed formats it contains the compressed pixel data.
+     *                      Otherwise, it contains width*height texels. If there is only one
+     *                      element and it contains nullptr fTexels, texture data is

[bsalomon, 2015/09/30 18:01:29]

Why one element and not just a 0 element array?

[cblume, 2015/10/08 09:27:56]

Oh. That...is a much better idea. I'll go through and fix these.

+     *                      uninitialized.
      * @param pixelOpsFlags see PixelOpsFlags enum above.
+     *
      * @return true if the write succeeded, false if not. The write can fail because of an
      *         unsupported combination of surface and src configs.
      */
     bool writeSurfacePixels(GrSurface* surface,
                             int left, int top, int width, int height,
+                            GrPixelConfig config, const SkTArray<SkMipMapLevel>& texels,
+                            uint32_t pixelOpsFlags = 0);
+
+    /**
+     * This function is a shim which creates a SkTArray<SkMipMapLevel> of size 1.
+     * It then calls writeSurfacePixels with that SkTArray.
+     *
+     * @param buffer    Pointer to the pixel values (optional).
+     * @param rowBytes  The number of bytes between rows of the texture. Zero
+     *                  implies tightly packed rows. For compressed pixel configs, this
+     *                  field is ignored.
+     */
+    bool writeSurfacePixels(GrSurface* surface,
+                            int left, int top, int width, int height,
                             GrPixelConfig config, const void* buffer,
                             size_t rowBytes,
                             uint32_t pixelOpsFlags = 0);
 
     /**
      * Copies a rectangle of texels from src to dst.
      * bounds.
      * @param dst           the surface to copy to.
      * @param src           the surface to copy from.
      * @param srcRect       the rectangle of the src that should be copied.
@@ skipping 203 matching lines @@
     /**
      * A callback similar to the above for use by the TextBlobCache
      * TODO move textblob draw calls below context so we can use the call above.
      */
     static void TextBlobCacheOverBudgetCB(void* data);
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif