commit a5758ea0a65c17a5e17f20192b29d209bb270f3b
author Kaiyi Li <kaiyili@google.com> Fri Aug 27 07:35:36 2021 -0700
committer Huan Song <huans@google.com> Tue Sep 21 23:41:39 2021 +0000
tree b0a19a70207e46991e91a73981e3cf3d7782961e
parent 3c2d9d15d4d2e15681450f90d39035c43ed96a47

Clean up HostComposer::presentDisplay

Calculate the rcCompose buffer, and buffer size upfront to save us some
if statements.

Bug: 200733475

Test: compile
Change-Id: I4f4fff4cb8d6ca589c850561d02a5a7b21491f71
Merged-In: I4f4fff4cb8d6ca589c850561d02a5a7b21491f71

system/hwc2/HostComposer.cpp

diff --git a/system/hwc2/HostComposer.cpp b/system/hwc2/HostComposer.cpp
index 996d2df..f028818 100644
--- a/system/hwc2/HostComposer.cpp
+++ b/system/hwc2/HostComposer.cpp
@@ -582,53 +582,31 @@
       p2->numLayers = numLayer;
     }
 
+    void *buffer;
+    uint32_t bufferSize;
+    if (hostCompositionV1) {
+      buffer = (void*)p;
+      bufferSize = sizeof(ComposeDevice) + numLayer * sizeof(ComposeLayer);
+    } else {
+      bufferSize = sizeof(ComposeDevice_v2) + numLayer * sizeof(ComposeLayer);
+      buffer = (void*)p2;
+    }
+
+    int retire_fd = -1;
     hostCon->lock();
     if (rcEnc->hasAsyncFrameCommands()) {
       if (mIsMinigbm) {
-        if (hostCompositionV1) {
-          rcEnc->rcComposeAsyncWithoutPost(
-              rcEnc, sizeof(ComposeDevice) + numLayer * sizeof(ComposeLayer),
-              (void*)p);
-        } else {
-          rcEnc->rcComposeAsyncWithoutPost(
-              rcEnc, sizeof(ComposeDevice_v2) + numLayer * sizeof(ComposeLayer),
-              (void*)p2);
-        }
+        rcEnc->rcComposeAsyncWithoutPost(rcEnc, bufferSize, buffer);
       } else {
-        if (hostCompositionV1) {
-          rcEnc->rcComposeAsync(
-              rcEnc, sizeof(ComposeDevice) + numLayer * sizeof(ComposeLayer),
-              (void*)p);
-        } else {
-          rcEnc->rcComposeAsync(
-              rcEnc, sizeof(ComposeDevice_v2) + numLayer * sizeof(ComposeLayer),
-              (void*)p2);
-        }
+        rcEnc->rcComposeAsync(rcEnc, bufferSize, buffer);
       }
     } else {
       if (mIsMinigbm) {
-        if (hostCompositionV1) {
-          rcEnc->rcComposeWithoutPost(
-              rcEnc, sizeof(ComposeDevice) + numLayer * sizeof(ComposeLayer),
-              (void*)p);
-        } else {
-          rcEnc->rcComposeWithoutPost(
-              rcEnc, sizeof(ComposeDevice_v2) + numLayer * sizeof(ComposeLayer),
-              (void*)p2);
-        }
+        rcEnc->rcComposeWithoutPost(rcEnc, bufferSize, buffer);
       } else {
-        if (hostCompositionV1) {
-          rcEnc->rcCompose(
-              rcEnc, sizeof(ComposeDevice) + numLayer * sizeof(ComposeLayer),
-              (void*)p);
-        } else {
-          rcEnc->rcCompose(
-              rcEnc, sizeof(ComposeDevice_v2) + numLayer * sizeof(ComposeLayer),
-              (void*)p2);
-        }
+        rcEnc->rcCompose(rcEnc, bufferSize, buffer);
       }
     }
-
     hostCon->unlock();
 
     // Send a retire fence and use it as the release fence for all layers,
@@ -637,7 +615,6 @@
                         EGL_NO_NATIVE_FENCE_FD_ANDROID};
 
     uint64_t sync_handle, thread_handle;
-    int retire_fd;
 
     // We don't use rc command to sync if we are using ANGLE on the guest with
     // virtio-gpu.