| Index: src/gpu/gl/GrGLGpu.h
|
| diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
|
| index 45337ddb3cae4ec793cbaeca6551f2db1e9c5e4a..832b3b77ca3270f5a1e912e47bf91382daa5bea3 100644
|
| --- a/src/gpu/gl/GrGLGpu.h
|
| +++ b/src/gpu/gl/GrGLGpu.h
|
| @@ -21,6 +21,8 @@
|
| #include "GrGpu.h"
|
| #include "GrPipelineBuilder.h"
|
| #include "GrXferProcessor.h"
|
| +#include "SkMipMapLevel.h"
|
| +#include "SkTArray.h"
|
| #include "SkTypes.h"
|
|
|
| class GrPipeline;
|
| @@ -124,10 +126,11 @@ private:
|
| void onResetContext(uint32_t resetBits) override;
|
|
|
| GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
|
| - const void* srcData, size_t rowBytes) override;
|
| + SkTArray<SkMipMapLevel>& texels) override;
|
| GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc,
|
| GrGpuResource::LifeCycle lifeCycle,
|
| - const void* srcData) override;
|
| + SkTArray<SkMipMapLevel>& texels) override;
|
| +
|
| GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
|
| GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
|
| GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) override;
|
| @@ -151,8 +154,8 @@ private:
|
|
|
| bool onWriteTexturePixels(GrTexture* texture,
|
| int left, int top, int width, int height,
|
| - GrPixelConfig config, const void* buffer,
|
| - size_t rowBytes) override;
|
| + GrPixelConfig config,
|
| + SkTArray<SkMipMapLevel>& texels) override;
|
|
|
| void onResolveRenderTarget(GrRenderTarget* target) override;
|
|
|
| @@ -276,8 +279,7 @@ private:
|
| bool isNewTexture,
|
| int left, int top, int width, int height,
|
| GrPixelConfig dataConfig,
|
| - const void* data,
|
| - size_t rowBytes);
|
| + SkTArray<SkMipMapLevel>& texels);
|
|
|
| // helper for onCreateCompressedTexture. If width and height are
|
| // set to -1, then this function will use desc.fWidth and desc.fHeight
|
| @@ -286,7 +288,7 @@ private:
|
| // the texture is already in GPU memory and that it's going to be updated
|
| // with new data.
|
| bool uploadCompressedTexData(const GrSurfaceDesc& desc,
|
| - const void* data,
|
| + const SkTArray<SkMipMapLevel>& texels,
|
| bool isNewTexture = true,
|
| int left = 0, int top = 0,
|
| int width = -1, int height = -1);
|
|
|