drm_hwcomposer: Support default values for Rect structures
This commit introduces two improvements:
1. Introduces frontend-agnostic structures for rects.
2. Support default values in them so that the backend can handle
cases where rects are not specified by the client, like
the client layer display frame, etc.
This reduces the complexity of the Internal layer, making it
feasible to use a single Frontend<->Internal layer API for
regular layers, as well as for the Client and Output layers.
Change-Id: Iab5030ad523d36ea4c5af142f6f628952467d6ab
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
diff --git a/hwc2_device/HwcDisplay.cpp b/hwc2_device/HwcDisplay.cpp
index 16d8bac..c2aefec 100644
--- a/hwc2_device/HwcDisplay.cpp
+++ b/hwc2_device/HwcDisplay.cpp
@@ -138,25 +138,6 @@
return handle;
}
-auto GetModesetLayerProperties(buffer_handle_t buffer, uint32_t width,
- uint32_t height) -> HwcLayer::LayerProperties {
- HwcLayer::LayerProperties properties;
- properties.buffer = {.buffer_handle = buffer, .acquire_fence = {}};
- properties.display_frame = {
- .left = 0,
- .top = 0,
- .right = int(width),
- .bottom = int(height),
- };
- properties.source_crop = (hwc_frect_t){
- .left = 0.0F,
- .top = 0.0F,
- .right = static_cast<float>(width),
- .bottom = static_cast<float>(height),
- };
- properties.blend_mode = BufferBlendMode::kNone;
- return properties;
-}
} // namespace
static BufferColorSpace Hwc2ToColorSpace(int32_t dataspace) {
@@ -308,8 +289,10 @@
buffer_handle_t modeset_buffer = GetModesetBuffer(width, height);
if (modeset_buffer != nullptr) {
auto modeset_layer = std::make_unique<HwcLayer>(this);
- modeset_layer->SetLayerProperties(
- GetModesetLayerProperties(modeset_buffer, width, height));
+ HwcLayer::LayerProperties properties;
+ properties.buffer = {.buffer_handle = modeset_buffer};
+ properties.blend_mode = BufferBlendMode::kNone;
+ modeset_layer->SetLayerProperties(properties);
modeset_layer->PopulateLayerData();
modeset_layer_data = modeset_layer->GetLayerData();
GraphicBufferAllocator::get().free(modeset_buffer);
@@ -867,14 +850,6 @@
if (staged_config == nullptr) {
return HWC2::Error::BadConfig;
}
- HwcLayer::LayerProperties lp;
- lp.display_frame = {
- .left = 0,
- .top = 0,
- .right = int(staged_config->mode.GetRawMode().hdisplay),
- .bottom = int(staged_config->mode.GetRawMode().vdisplay),
- };
- client_layer_.SetLayerProperties(lp);
configs_.active_config_id = staged_mode_config_id_.value();
a_args.display_mode = staged_config->mode;
@@ -1059,19 +1034,6 @@
return HWC2::Error::BadLayer;
}
- auto &bi = client_layer_.GetLayerData().bi;
- if (!bi) {
- ALOGE("%s: Invalid state", __func__);
- return HWC2::Error::BadLayer;
- }
-
- lp = {};
- lp.source_crop = {.left = 0.0F,
- .top = 0.0F,
- .right = float(bi->width),
- .bottom = float(bi->height)};
- client_layer_.SetLayerProperties(lp);
-
return HWC2::Error::None;
}