aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrResourceProvider.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-07-11 14:22:35 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-12 11:40:15 +0000
commit590533f066035a48df9f78395a80314b559f4714 (patch)
tree49b615883e15aefbaaa6ecba9fd869584889b767 /src/gpu/GrResourceProvider.cpp
parentc4176a2fa5aab30e5886f05bbe20de225dbe997b (diff)
Plumb raw GrMipLevel* down instead of SkTArray<GrMipLevel> in GrGpu
Change-Id: I34033b6ecb469458eb820cbc01aad8c7bb876312 Reviewed-on: https://skia-review.googlesource.com/22212 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrResourceProvider.cpp')
-rw-r--r--src/gpu/GrResourceProvider.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index e8eb4e2020..f3be50b21c 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -74,21 +74,21 @@ bool validate_desc(const GrSurfaceDesc& desc, const GrCaps& caps, int levelCount
}
sk_sp<GrTexture> GrResourceProvider::createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
- const SkTArray<GrMipLevel>& texels,
+ const GrMipLevel texels[], int mipLevelCount,
SkDestinationSurfaceColorMode mipColorMode) {
ASSERT_SINGLE_OWNER
- SkASSERT(texels.count() >= 1);
+ SkASSERT(mipLevelCount >= 1);
if (this->isAbandoned()) {
return nullptr;
}
- if (!validate_desc(desc, *fCaps, texels.count())) {
+ if (!validate_desc(desc, *fCaps, mipLevelCount)) {
return nullptr;
}
- sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted, texels));
+ sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted, texels, mipLevelCount));
if (tex) {
tex->texturePriv().setMipColorMode(mipColorMode);
}
@@ -152,10 +152,7 @@ sk_sp<GrTextureProxy> GrResourceProvider::createTextureProxy(const GrSurfaceDesc
}
}
- SkTArray<GrMipLevel> texels(1);
- texels.push_back(mipLevel);
-
- sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted, texels));
+ sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted, &mipLevel, 1));
return GrSurfaceProxy::MakeWrapped(std::move(tex));
}