diff options
| -rw-r--r-- | src/gpu/GrDrawingManager.cpp | 4 | ||||
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 11 | ||||
| -rw-r--r-- | tests/GrMipMappedTest.cpp | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 645b3d17a0..39ff76fbed 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -380,16 +380,12 @@ 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 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); } diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index ee4838d2ce..4c93714401 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -87,13 +87,7 @@ 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()); |