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/GrTextureProxy.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/GrTextureProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureProxy.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp index d6ce9feda4..9245221ef3 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/GrTextureProxy.cpp @@ -15,11 +15,10 @@ #include "GrTexturePriv.h" // Deferred version -GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, GrMipMapped mipMapped, - SkBackingFit fit, SkBudgeted budgeted, const void* srcData, - size_t /*rowBytes*/, uint32_t flags) +GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, SkBackingFit fit, SkBudgeted budgeted, + const void* srcData, size_t /*rowBytes*/, uint32_t flags) : INHERITED(srcDesc, fit, budgeted, flags) - , fMipMapped(mipMapped) + , fMipMapped(GrMipMapped::kNo) , fProxyProvider(nullptr) , fDeferredUploader(nullptr) { SkASSERT(!srcData); // currently handled in Make() |