aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar cblume <cblume@chromium.org>2016-02-29 11:27:31 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-29 11:27:31 -0800
commit89685d9112cfdffb35d14fb18ddff38a18729587 (patch)
tree6677937ee4120fbd00daad01a3410c15a42858df
parent27876bc1156bcdd15cac7f0fe6228eb7806b8e96 (diff)
Disabling mipmap generation until anisotropic mipmap levels are generated.
-rw-r--r--src/core/SkImageCacherator.cpp2
-rw-r--r--src/gpu/GrImageIDTextureAdjuster.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp
index 594a8e26ce..ea4d4c2bab 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 58dc5b975b..5ba99d20de 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 {