diff options
author | Greg Daniel <egdaniel@google.com> | 2018-02-14 13:52:27 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-14 19:55:24 +0000 |
commit | 95edb43251e8fcef4286c91d334c3259940a0095 (patch) | |
tree | 55798313262fc26d58486e07419f00c925b8209d /src/gpu/GrSurfaceProxy.cpp | |
parent | 33f38b05fb54994a39ff77c1b8681276c6d03ea3 (diff) |
Revert "Revert "When creating emptyp MipMap proxies, don't instantiate them immediately.""
This reverts commit 0ee866dac78b60497b4c107995d3c2747309ef8b.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> 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>
TBR=egdaniel@google.com,robertphillips@google.com
Bug: skia:
Change-Id: Ice34283f9ac183faed6e061d8162cf2226b18289
Reviewed-on: https://skia-review.googlesource.com/107320
Reviewed-by: Robert Phillips <robertphillips@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, 23 insertions, 4 deletions
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp index 48d4be1c8a..5b20ca5146 100644 --- a/src/gpu/GrSurfaceProxy.cpp +++ b/src/gpu/GrSurfaceProxy.cpp @@ -117,7 +117,6 @@ 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) { @@ -130,10 +129,30 @@ sk_sp<GrSurface> GrSurfaceProxy::createSurfaceImpl( desc.fSampleCnt = sampleCnt; sk_sp<GrSurface> surface; - if (SkBackingFit::kApprox == fFit) { - surface.reset(resourceProvider->createApproxTexture(desc, fFlags).release()); + 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); } else { - surface.reset(resourceProvider->createTexture(desc, fBudgeted, fFlags).release()); + if (SkBackingFit::kApprox == fFit) { + surface = resourceProvider->createApproxTexture(desc, fFlags); + } else { + surface = resourceProvider->createTexture(desc, fBudgeted, fFlags); + } } if (!surface) { return nullptr; |