aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-07-25 08:52:32 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-27 13:37:31 +0000
commit504dd052b94c318afeadc5c68e1c3b233d7571c1 (patch)
treeb112487d42722cad1e708242ee6cad9e14bcddf0 /tests
parentda1be46e240020674ae392ced3c6bf85e9ecd157 (diff)
Reland "Go back to cleaning up MIP levels on texture export rather than assuming dirty on texture import."
This is a reland of 01d6fc9d8415e400a7eac95518356ecf341aa5cb Chrome layout tests have been suppressed so this shouldn't block a Skia roll. Original change's description: > Go back to cleaning up MIP levels on texture export rather than assuming dirty > on texture import. > > Bug: skia:8155 > Change-Id: I23399f442d52c73906829132f798eda260b6d4ae > Reviewed-on: https://skia-review.googlesource.com/143291 > Auto-Submit: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:8155 Change-Id: Ia3843b66c2453daf15e566b7ecf890c2ff4aed22 Reviewed-on: https://skia-review.googlesource.com/143960 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/GrMipMappedTest.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index ee4838d2ce..4c93714401 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -87,13 +87,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrWrappedMipMappedTest, reporter, ctxInfo) {
if (isRT) {
REPORTER_ASSERT(reporter, texture->texturePriv().mipMapsAreDirty());
} else {
-#if 1
- // This is temporarily checks that the new image DOES have dirty MIP levels. See
- // comment in SkImage_Gpu.cpp, new_wrapped_texture_common().
- REPORTER_ASSERT(reporter, texture->texturePriv().mipMapsAreDirty());
-#else
REPORTER_ASSERT(reporter, !texture->texturePriv().mipMapsAreDirty());
-#endif
}
} else {
REPORTER_ASSERT(reporter, GrMipMapped::kNo == texture->texturePriv().mipMapped());