diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrDrawingManager.cpp | 4 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index e3e7a9cba3..8b0fb22f6b 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -375,12 +375,16 @@ GrSemaphoresSubmitted GrDrawingManager::prepareSurfaceForExternalIO( if (auto* rt = surface->asRenderTarget()) { gpu->resolveRenderTarget(rt); } +#if 0 + // This is temporarily is disabled. See comment in SkImage_Gpu.cpp, + // new_wrapped_texture_common(). if (auto* tex = surface->asTexture()) { if (tex->texturePriv().mipMapped() == GrMipMapped::kYes && tex->texturePriv().mipMapsAreDirty()) { gpu->regenerateMipMapLevels(tex); } } +#endif return result; } diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 1dea80659a..1d5ca96848 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -290,6 +290,17 @@ 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); } |