commit 810477b6774cc1e8d6affeef2b9fe637ee01368b
author Lyn Han <lynhan@google.com> Mon Nov 23 20:34:04 2020 +0000
committer Lyn Han <lynhan@google.com> Mon Nov 23 20:34:04 2020 +0000
tree 39769d3af2791cf96bef9c618077923462c79e0e
parent 6c24c1b2db1d5993ba7d6a201db75ded985648c8

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

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index aefedb4..8c5f0e6 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -550,7 +550,6 @@
     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 @@
 
             matrix.postConcat(texMatrix);
             matrix.postScale(rotatedBufferWidth, rotatedBufferHeight);
-            sk_sp<SkShader> 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<SkShader> shader = image->makeShader(matrix);
 
             if (mUseColorManagement &&
                 needsToneMapping(layer->sourceDataspace, display.outputDataspace)) {