diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-02-07 17:08:21 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-08 12:36:29 +0000 |
| commit | 4150eea6c49ecec882a8d3e1c61d6a25fcd1e905 (patch) | |
| tree | 21b7089d6745f769be88f8f3d9a127d521ff48be /src/gpu/GrTextureRenderTargetProxy.cpp | |
| parent | 1f1bb9c0b8d5f50ac74716e6961a6c92f1d373d8 (diff) | |
Move control of explicit GPU resource allocation to GrContextOptions
Change-Id: Ic284acc79bab5936f0007d5ae5fb1e7a9929e2af
Reviewed-on: https://skia-review.googlesource.com/104880
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrTextureRenderTargetProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureRenderTargetProxy.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp index f1e47ec32b..3312077236 100644 --- a/src/gpu/GrTextureRenderTargetProxy.cpp +++ b/src/gpu/GrTextureRenderTargetProxy.cpp @@ -108,7 +108,8 @@ sk_sp<GrSurface> GrTextureRenderTargetProxy::createSurface( void GrTextureRenderTargetProxy::validateLazySurface(const GrSurface* surface) { // Anything checked here should also be checking the GrTextureProxy version SkASSERT(surface->asTexture()); - SkASSERT(surface->asTexture()->texturePriv().mipMapped() == this->mipMapped()); + SkASSERT(GrMipMapped::kNo == this->mipMapped() || + GrMipMapped::kYes == surface->asTexture()->texturePriv().mipMapped()); // Anything checked here should also be checking the GrRenderTargetProxy version SkASSERT(surface->asRenderTarget()); |