Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the ICL 3 displays issue #658

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions common/display/displayplanemanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,13 @@ bool DisplayPlaneManager::ValidateLayers(
// it.
bool fall_back = FallbacktoGPU(plane, layer, composition);
test_commit_done = true;
bool force_separate = false;
size_t composition_size = composition.size();

if (fall_back && !prefer_seperate_plane && composition_size > 1) {
force_separate =
ForceSeparatePlane(composition.at(composition_size - 1), layer);
}
if (fall_back) {
ISURFACETRACE(
"Force GPU rander the plane[%d], for the layer[%d] isVideo: "
Expand All @@ -249,6 +256,18 @@ bool DisplayPlaneManager::ValidateLayers(
layer->GetAlpha());
last_plane.ForceGPURendering();
}
if (!fall_back || prefer_seperate_plane || force_separate ||
composition.size() == 1) {
// Separate plane added
} else if (composition.size() > 1) {
// Add to the back instead of seprate plane
composition.pop_back();
DisplayPlaneState &last_plane = composition.back();
ISURFACETRACE("Added Layer: %d %d validate_final_layers: %d \n",
layer->GetZorder(), composition.size(),
validate_final_layers);
last_plane.AddLayer(layer);
}
} else {
// Add to last plane when plane has been used up
DisplayPlaneState &last_plane = composition.back();
Expand Down