DO NOT MERGE: revert HWC2 changes
The changes are causing some issues with multi-window use cases.
Fixes: 64491794
Test: test gmail compose in multi-window + show taps enabled
Change-Id: I0b0a3f351ed48f81db89a71c78bf17bab8cb2acf
Signed-off-by: Adrian Salido <salidoa@google.com>
diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 642a1c7..3d27f13 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -375,8 +375,7 @@
std::vector<DrmCompositionRegion> ®ions = display_comp->squash_regions();
ret = pre_compositor_->Composite(display_comp->layers().data(),
- regions.data(), regions.size(), fb.buffer(),
- display_comp->importer());
+ regions.data(), regions.size(), fb.buffer());
pre_compositor_->Finish();
if (ret) {
@@ -409,8 +408,7 @@
std::vector<DrmCompositionRegion> ®ions = display_comp->pre_comp_regions();
ret = pre_compositor_->Composite(display_comp->layers().data(),
- regions.data(), regions.size(), fb.buffer(),
- display_comp->importer());
+ regions.data(), regions.size(), fb.buffer());
pre_compositor_->Finish();
if (ret) {
@@ -628,8 +626,6 @@
if (ret)
ALOGW("Acquire fence %d wait %d failed (%d). Total time %d",
acquire_fence, i, ret, total_fence_timeout);
- else
- break;
}
if (ret) {
ALOGE("Failed to wait for acquire %d/%d", acquire_fence, ret);