commit bbceb46b722db9d1ececb909c845e45302721f89
author Vishnu Nair <vishnun@google.com> Mon Oct 10 04:52:13 2022 +0000
committer Vishnu Nair <vishnun@google.com> Mon Oct 10 20:51:24 2022 +0000
tree 8a8685b42b9e1cd4535a717256fe848d7abfbbff
parent 933a6bfdb7d5d77cfda1e4646cf9a3a985d4e562

SurfaceComposerClient: Clean up layer state

- align layer alpha/color with SF layer drawing state
- remove unused flags and fields

Bug: 238781169
Test: presubmit

Change-Id: I4be9c56b3006b7d7a0ca19160511ebb9e3551a8c

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 410e438..9bb9305 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -3633,7 +3633,7 @@
     }
 
     if (s.what & layer_state_t::eAlphaChanged) {
-        if (mDrawingState.color.a != s.alpha) {
+        if (mDrawingState.color.a != s.color.a) {
             ALOGV("%s: false [eAlphaChanged changed]", __func__);
             return false;
         }
@@ -3677,9 +3677,9 @@
         }
     }
 
-    if (s.what & layer_state_t::eTransformChanged) {
-        if (mDrawingState.bufferTransform != s.transform) {
-            ALOGV("%s: false [eTransformChanged changed]", __func__);
+    if (s.what & layer_state_t::eBufferTransformChanged) {
+        if (mDrawingState.bufferTransform != s.bufferTransform) {
+            ALOGV("%s: false [eBufferTransformChanged changed]", __func__);
             return false;
         }
     }
@@ -4177,15 +4177,12 @@
 }
 
 bool Layer::setColor(const half3& color) {
-    if (mDrawingState.color.r == color.r && mDrawingState.color.g == color.g &&
-        mDrawingState.color.b == color.b) {
+    if (mDrawingState.color.rgb == color) {
         return false;
     }
 
     mDrawingState.sequence++;
-    mDrawingState.color.r = color.r;
-    mDrawingState.color.g = color.g;
-    mDrawingState.color.b = color.b;
+    mDrawingState.color.rgb = color;
     mDrawingState.modified = true;
     setTransactionFlags(eTransactionNeeded);
     return true;