Creating functions for uploading a mipmapped texture.

include/gpu/GrSurface.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrSurface_DEFINED
 #define GrSurface_DEFINED
 
 #include "GrTypes.h"
 #include "GrGpuResource.h"
 #include "SkImageInfo.h"
+#include "SkMipMapLevel.h"
 #include "SkRect.h"
+#include "SkTArray.h"
 
 class GrRenderTarget;
 class GrSurfacePriv;
 class GrTexture;
 
 class SK_API GrSurface : public GrGpuResource {
 public:
     /**
      * Retrieves the width of the surface.
      */
@@ skipping 62 matching lines @@
                     uint32_t pixelOpsFlags = 0);
 
     /**
      * Copy the src pixels [buffer, rowbytes, pixelconfig] into the surface at the specified
      * rectangle.
      * @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 the rectangle 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-size 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
+     *                      uninitialized.
      * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
      *
      * @return true if the read succeeded, false if not. The read can fail because of an unsupported
      *              pixel config.
      */
     bool writePixels(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 writePixels() with that SkTArray.
+     * This is so older code which currently uses this function signature will

[bsalomon, 2015/09/15 13:14:10]

I'd take off the thing about older code. I expect even future callers would
continue to use this as a convenience for cases where they know the texture only
has a base level.

[cblume, 2015/09/16 18:40:46]

I've updated all the shim comments. :)

+     * continue to work.
+     */
+    bool writePixels(int left, int top, int width, int height,
+                     GrPixelConfig config,
                      const void* buffer,
                      size_t rowBytes = 0,
                      uint32_t pixelOpsFlags = 0);
 
     /**
      * After this returns any pending writes to the surface will be issued to the backend 3D API.
      */
     void flushWrites();
 
 
@@ skipping 53 matching lines @@
         }
     }
 
     ReleaseProc fReleaseProc;
     ReleaseCtx  fReleaseCtx;
 
     typedef GrGpuResource INHERITED;
 };
 
 #endif