From 89685d9112cfdffb35d14fb18ddff38a18729587 Mon Sep 17 00:00:00 2001 From: cblume Date: Mon, 29 Feb 2016 11:27:31 -0800 Subject: [PATCH] Disabling mipmap generation until anisotropic mipmap levels are generated. BUG=590804 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744413002 Review URL: https://codereview.chromium.org/1744413002 --- src/core/SkImageCacherator.cpp | 2 ++ src/gpu/GrImageIDTextureAdjuster.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 594a8e2..ea4d4c2 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -303,6 +303,8 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key SkBitmap bitmap; if (this->tryLockAsBitmap(&bitmap, client, chint)) { GrTexture* tex = nullptr; + // disable mipmapping until we generate anisotropic mipmap levels + willBeMipped = false; if (willBeMipped) { tex = GrGenerateMipMapsAndUploadToTexture(ctx, bitmap); } else { diff --git a/src/gpu/GrImageIDTextureAdjuster.cpp b/src/gpu/GrImageIDTextureAdjuster.cpp index 58dc5b9..5ba99d2 100644 --- a/src/gpu/GrImageIDTextureAdjuster.cpp +++ b/src/gpu/GrImageIDTextureAdjuster.cpp @@ -90,7 +90,8 @@ GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped) { return tex; } } - + // disable mipmapping until we generate anisotropic mipmap levels + willBeMipped = false; if (willBeMipped) { tex = GrGenerateMipMapsAndUploadToTexture(this->context(), fBitmap); } else { -- 2.7.4