From 810477b6774cc1e8d6affeef2b9fe637ee01368b Mon Sep 17 00:00:00 2001 From: Lyn Han Date: Mon, 23 Nov 2020 20:34:04 +0000 Subject: Revert "Support bilinear filtering in Skia-RE" This reverts commit 6c24c1b2db1d5993ba7d6a201db75ded985648c8. Reason for revert: Potential culprit for b/174062136 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: I5fb5cd075c2526b73eaee5920f29ba9fc4eab4c6 --- libs/renderengine/skia/SkiaGLRenderEngine.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp index aefedb4659..8c5f0e62c9 100644 --- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp @@ -550,7 +550,6 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, screenTransform.preRotate(toDegrees(display.orientation)); screenTransform.preTranslate(-clipWidth / 2, -clipHeight / 2); screenTransform.preTranslate(-display.clip.left, -display.clip.top); - // Traverse all layers. for (const auto& layer : layers) { const SkMatrix drawTransform = getDrawTransform(layer, screenTransform); @@ -653,16 +652,7 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, matrix.postConcat(texMatrix); matrix.postScale(rotatedBufferWidth, rotatedBufferHeight); - sk_sp shader; - - if (layer->source.buffer.useTextureFiltering) { - shader = image->makeShader(SkTileMode::kClamp, SkTileMode::kClamp, - SkSamplingOptions( - {SkSamplingMode::kLinear, SkMipmapMode::kNone}), - &matrix); - } else { - shader = image->makeShader(matrix); - } + sk_sp shader = image->makeShader(matrix); if (mUseColorManagement && needsToneMapping(layer->sourceDataspace, display.outputDataspace)) { -- cgit v1.2.3-59-g8ed1b