aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-02-08 16:26:47 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-08 21:53:50 +0000
commit6ba15ecb1cdd75f57abae8eeece7886aa8f28832 (patch)
tree85cdce75774206f17823a1fcbbdbdc49243cbf73 /src
parent59dad9111792ca1ceebfb444497f81d9eb357b7d (diff)
Fix assert in GrTextureProxy.cpp
Change-Id: Id9fc8343c5fa8605250dcab4bd1b96f882741018 Reviewed-on: https://skia-review.googlesource.com/105743 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrTextureProxy.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index 72b810620d..d15b611edb 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -149,7 +149,8 @@ void GrTextureProxy::validateLazySurface(const GrSurface* surface) {
// Anything that is checked here should be duplicated in GrTextureRenderTargetProxy's version
SkASSERT(surface->asTexture());
- SkASSERT(surface->asTexture()->texturePriv().mipMapped() == this->mipMapped());
+ SkASSERT(GrMipMapped::kNo == this->mipMapped() ||
+ GrMipMapped::kYes == surface->asTexture()->texturePriv().mipMapped());
}
#endif