From 9457546761a40c96f586b34b755fef47a7ad006a Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 21 Jun 2018 17:00:26 -0400 Subject: Alternative fix for stale MIP maps on texture export/import. This change assumes imported textures in SkImages have dirty mip levels and disables regenerating the MIP levels on export (added in https://skia.googlesource.com/skia/+/930f939c48af1be6005af12bb6f709ca5da9d118). This is being done temporarily because it is a simpler change to cherry pick to earlier branches than https://skia.googlesource.com/skia/+/930f939c48af1be6005af12bb6f709ca5da9d118 Bug: chromium:850617 Change-Id: I7c90da782a0ed9014acd6a54ffdee1a0b34fa00c Reviewed-on: https://skia-review.googlesource.com/136788 Commit-Queue: Brian Salomon Auto-Submit: Brian Salomon Reviewed-by: Greg Daniel --- tests/GrMipMappedTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/GrMipMappedTest.cpp') diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 5c303633ec..e7c98633d7 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -87,7 +87,13 @@ 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()); -- cgit v1.2.3