aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image
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 /src/image
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 'src/image')
-rw-r--r--src/image/SkImage_Gpu.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 1d5ca96848..1dea80659a 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -290,17 +290,6 @@ static sk_sp<SkImage> new_wrapped_texture_common(GrContext* ctx,
if (!proxy) {
return nullptr;
}
-#if 1
- // Temporary fix for crbug.com/850617 that can be cleanly merged back to older branches. Assume
- // any MIP levels on the incoming texture are dirty. The proper fix is to make them clean on
- // export. See #if 0'ed out code in GrDrawingManager::prepareSurfaceForExternalIO().
- SkASSERT(proxy->priv().isInstantiated());
- if (auto* tex = proxy->priv().peekTexture()) {
- if (tex->texturePriv().mipMapped() == GrMipMapped::kYes) {
- proxy->priv().peekTexture()->texturePriv().markMipMapsDirty();
- }
- }
-#endif
return sk_make_sp<SkImage_Gpu>(sk_ref_sp(ctx), kNeedNewImageUniqueID, at, std::move(proxy),
std::move(colorSpace), SkBudgeted::kNo);
}