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/GrTextureRenderTargetProxy.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/GrTextureRenderTargetProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureRenderTargetProxy.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp index 2d5dbeee9f..50077c4c0f 100644 --- a/src/gpu/GrTextureRenderTargetProxy.cpp +++ b/src/gpu/GrTextureRenderTargetProxy.cpp @@ -19,12 +19,13 @@ // GrRenderTargetProxy) so its constructor must be explicitly called. GrTextureRenderTargetProxy::GrTextureRenderTargetProxy(const GrCaps& caps, const GrSurfaceDesc& desc, + GrMipMapped mipMapped, SkBackingFit fit, SkBudgeted budgeted, uint32_t flags) : GrSurfaceProxy(desc, fit, budgeted, flags) // for now textures w/ data are always wrapped - , GrTextureProxy(desc, fit, budgeted, nullptr, 0, flags) + , GrTextureProxy(desc, mipMapped, fit, budgeted, nullptr, 0, flags) , GrRenderTargetProxy(caps, desc, fit, budgeted, flags) { } @@ -59,7 +60,7 @@ size_t GrTextureRenderTargetProxy::onUninstantiatedGpuMemorySize() const { int colorSamplesPerPixel = this->numColorSamples(); if (colorSamplesPerPixel > 1) { // Add one to account for the resolve buffer. - ++colorSamplesPerPixel += 1; + ++colorSamplesPerPixel; } // TODO: do we have enough information to improve this worst case estimate? |