diff options
author | Greg Daniel <egdaniel@google.com> | 2018-02-14 14:40:37 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-14 14:40:48 +0000 |
commit | 0ee866dac78b60497b4c107995d3c2747309ef8b (patch) | |
tree | c03802d73fe912e44880e822ba179c6889e16ee8 /src/gpu/GrSurfaceProxy.cpp | |
parent | 83373a82747ab600e91873f594cd8df65e1676a4 (diff) |
Revert "When creating emptyp MipMap proxies, don't instantiate them immediately."
This reverts commit 8242c5c199f5d04e4209222b265f9e27f7c55fa7.
Reason for revert: Hitting assert on intel bots on skbug6850overlay2.skp, SkASSERT(proxy->getUniqueKey().isValid()); in processInvalidProxyUniqueKey
Original change's description:
> When creating emptyp MipMap proxies, don't instantiate them immediately.
>
> This chnages makes it match how we handle non mipped proxies where we
> don't actually instantiate them until we need to.
>
> Bug: skia:
> Change-Id: Id0c50eefce43ef1458a3ff0bb1881a817b045279
> Reviewed-on: https://skia-review.googlesource.com/106966
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,robertphillips@google.com
Change-Id: I1fa6165b69c5bbb1d6bb10abba33dcdb55a27ba3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/107263
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrSurfaceProxy.cpp')
-rw-r--r-- | src/gpu/GrSurfaceProxy.cpp | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp index 5b20ca5146..48d4be1c8a 100644 --- a/src/gpu/GrSurfaceProxy.cpp +++ b/src/gpu/GrSurfaceProxy.cpp @@ -117,6 +117,7 @@ sk_sp<GrSurface> GrSurfaceProxy::createSurfaceImpl( GrSurfaceFlags flags, GrMipMapped mipMapped) const { SkASSERT(GrSurfaceProxy::LazyState::kNot == this->lazyInstantiationState()); SkASSERT(!fTarget); + SkASSERT(GrMipMapped::kNo == mipMapped); GrSurfaceDesc desc; desc.fFlags = flags; if (fNeedsClear) { @@ -129,30 +130,10 @@ sk_sp<GrSurface> GrSurfaceProxy::createSurfaceImpl( desc.fSampleCnt = sampleCnt; sk_sp<GrSurface> surface; - if (GrMipMapped::kYes == mipMapped) { - SkASSERT(SkBackingFit::kExact == fFit); - - // SkMipMap doesn't include the base level in the level count so we have to add 1 - int mipCount = SkMipMap::ComputeLevelCount(desc.fWidth, desc.fHeight) + 1; - // We should have caught the case where mipCount == 1 when making the proxy and instead - // created a non-mipmapped proxy. - SkASSERT(mipCount > 1); - std::unique_ptr<GrMipLevel[]> texels(new GrMipLevel[mipCount]); - - // We don't want to upload any texel data - for (int i = 0; i < mipCount; i++) { - texels[i].fPixels = nullptr; - texels[i].fRowBytes = 0; - } - - surface = resourceProvider->createTexture(desc, fBudgeted, texels.get(), mipCount, - SkDestinationSurfaceColorMode::kLegacy); + if (SkBackingFit::kApprox == fFit) { + surface.reset(resourceProvider->createApproxTexture(desc, fFlags).release()); } else { - if (SkBackingFit::kApprox == fFit) { - surface = resourceProvider->createApproxTexture(desc, fFlags); - } else { - surface = resourceProvider->createTexture(desc, fBudgeted, fFlags); - } + surface.reset(resourceProvider->createTexture(desc, fBudgeted, fFlags).release()); } if (!surface) { return nullptr; |