| Index: src/gpu/GrTextureProvider.cpp
|
| diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp
|
| index 26384abbd2ad5bcd93ca65203631035a16d18334..47007a9834a7e788251fb2f5d57716bfc4d96cd3 100644
|
| --- a/src/gpu/GrTextureProvider.cpp
|
| +++ b/src/gpu/GrTextureProvider.cpp
|
| @@ -1,4 +1,3 @@
|
| -
|
| /*
|
| * Copyright 2015 Google Inc.
|
| *
|
| @@ -18,7 +17,7 @@ enum ScratchTextureFlags {
|
| };
|
|
|
| GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
|
| - const void* srcData, size_t rowBytes) {
|
| + const SkTArray<SkMipMapLevel>& texels) {
|
| if (this->isAbandoned()) {
|
| return nullptr;
|
| }
|
| @@ -30,8 +29,8 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budg
|
| static const uint32_t kFlags = kExact_ScratchTextureFlag |
|
| kNoCreate_ScratchTextureFlag;
|
| if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) {
|
| - if (!srcData || texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
|
| - srcData, rowBytes)) {
|
| + if (texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
|
| + texels)) {
|
| if (!budgeted) {
|
| texture->resourcePriv().makeUnbudgeted();
|
| }
|
| @@ -40,7 +39,25 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budg
|
| texture->unref();
|
| }
|
| }
|
| - return fGpu->createTexture(desc, budgeted, srcData, rowBytes);
|
| + return fGpu->createTexture(desc, budgeted, texels);
|
| +}
|
| +
|
| +GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
|
| + const void* srcData, size_t rowBytes) {
|
| + const int height = desc.fHeight;
|
| + const int width = desc.fWidth;
|
| + if (height < 0 || width < 0) {
|
| + return nullptr;
|
| + }
|
| + const uint32_t baseLevelHeight = height;
|
| + const uint32_t baseLevelWidth = width;
|
| +
|
| + SkMipMapLevel level(srcData, rowBytes, baseLevelWidth, baseLevelHeight);
|
| + const int mipLevelCount = 1;
|
| + SkTArray<SkMipMapLevel> texels(mipLevelCount);
|
| + texels.push_back(level);
|
| +
|
| + return this->createTexture(desc, budgeted, texels);
|
| }
|
|
|
| GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {
|
|
|