| Index: src/gpu/GrTextureProvider.cpp
|
| diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp
|
| index cb652f7a7fd8c2e27b46fb7a4c802a4031b900e1..7a91f9ca07ba78639716594a2034ce9995e7fbb2 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;
|
| }
|
| @@ -27,20 +26,34 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budg
|
| return nullptr;
|
| }
|
| if (!GrPixelConfigIsCompressed(desc.fConfig)) {
|
| - 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 (!budgeted) {
|
| - texture->resourcePriv().makeUnbudgeted();
|
| + // In the case of mipmaps, do not use a scratch texture
|
| + if (texels.count() < 2) {
|
| + SkMipMapLevel baseMipLevel = texels[0];
|
| + static const uint32_t kFlags = kExact_ScratchTextureFlag |
|
| + kNoCreate_ScratchTextureFlag;
|
| + if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) {
|
| + if (texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
|
| + baseMipLevel.fTexels, baseMipLevel.fRowBytes)) {
|
| + if (!budgeted) {
|
| + texture->resourcePriv().makeUnbudgeted();
|
| + }
|
| + return texture;
|
| }
|
| - return texture;
|
| + texture->unref();
|
| }
|
| - 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) {
|
| + SkMipMapLevel level(srcData, rowBytes, desc.fWidth, desc.fHeight);
|
| + const int mipLevelCount = 1;
|
| + SkTArray<SkMipMapLevel> texels(mipLevelCount);
|
| + texels.push_back(level);
|
| +
|
| + return this->createTexture(desc, budgeted, texels);
|
| }
|
|
|
| GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {
|
|
|