commit 3a2a24f55bd1ac9ff7fecbda1bbc096faad631e2
author Lyn Han <lynhan@google.com> Mon Nov 23 22:11:16 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 23 22:11:16 2020 +0000
tree 0d5cab9a96f1a5f44065974f2d97ae4e9b8c3d96
parent 023e314f11bd0e01d5fc9defd7fc693a2a185f00
parent 1bdedb30a79116475e31fad741a375e1572f3514

Merge "Revert "Respect LayerSettings::alpha in Skia-RE for buffer layers""

libs/renderengine/skia/SkiaGLRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index 4105bd7..07be0b6 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -668,8 +668,6 @@
             } else {
                 paint.setShader(shader);
             }
-            // Make sure to take into the account the alpha set on the layer.
-            paint.setAlphaf(layer->alpha);
         } else {
             ATRACE_NAME("DrawColor");
             const auto color = layer->source.solidColor;
@@ -816,7 +814,7 @@
     ATRACE_CALL();
 
     SkPaint paint;
-    paint.setAlphaf(effectRegion.alpha);
+    paint.setAlpha(static_cast<int>(effectRegion.alpha * 255));
     const auto matrix = mBlurFilter->getShaderMatrix();
     paint.setShader(blurredSurface->makeImageSnapshot()->makeShader(matrix));