commit 7ab8c1802ed45f7f3794d7d32165457f23095170
author Drew Davenport <ddavenport@google.com> Tue Sep 24 17:04:26 2024 -0600
committer Drew Davenport <ddavenport@google.com> Mon Oct 14 14:23:24 2024 -0600
tree 5fae6ced57118dd33c4dc8d0ac56dedc65d793a5
parent 07b96f075649f20541ae7abb97aa866839aa266e

drm_hwcomposer: Stop using HWC2 hooks for source crop

Add source_crop to LayerProperties and set it together with other layer
properties.

Change-Id: I2153037b6df3ad2ecf1008d8bafe09d62ef59116
Signed-off-by: Drew Davenport <ddavenport@google.com>

hwc3/ComposerClient.cpp

diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 728361b..fba8222 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -211,6 +211,13 @@
   return hwc_rect{rect->left, rect->top, rect->right, rect->bottom};
 }
 
+std::optional<hwc_frect> AidlToFRect(const std::optional<common::FRect>& rect) {
+  if (!rect) {
+    return std::nullopt;
+  }
+  return hwc_frect{rect->left, rect->top, rect->right, rect->bottom};
+}
+
 std::optional<float> AidlToAlpha(const std::optional<PlaneAlpha>& alpha) {
   if (!alpha) {
     return std::nullopt;
@@ -479,11 +486,10 @@
   properties.composition_type = AidlToCompositionType(command.composition);
   properties.display_frame = AidlToRect(command.displayFrame);
   properties.alpha = AidlToAlpha(command.planeAlpha);
+  properties.source_crop = AidlToFRect(command.sourceCrop);
+
   layer->SetLayerProperties(properties);
 
-  if (command.sourceCrop) {
-    ExecuteSetLayerSourceCrop(display_id, layer_wrapper, *command.sourceCrop);
-  }
   if (command.transform) {
     ExecuteSetLayerTransform(display_id, layer_wrapper, *command.transform);
   }
@@ -1184,16 +1190,6 @@
   }
 }
 
-void ComposerClient::ExecuteSetLayerSourceCrop(
-    int64_t /*display_id*/, HwcLayerWrapper& layer,
-    const common::FRect& source_crop) {
-  const hwc_frect_t rect{source_crop.left, source_crop.top, source_crop.right,
-                         source_crop.bottom};
-  auto err = Hwc2toHwc3Error(layer.layer->SetLayerSourceCrop(rect));
-  if (err != hwc3::Error::kNone) {
-    cmd_result_writer_->AddError(err);
-  }
-}
 void ComposerClient::ExecuteSetLayerTransform(
     int64_t /*display_id*/, HwcLayerWrapper& layer,
     const ParcelableTransform& transform) {