Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwc2: cursor fixes 

am: d8991a4624

Change-Id: Ic63729e0b5bb43367f2d725bf488b5c3147e9623
This commit is contained in:
Naseer Ahmed 2017-08-24 02:09:44 +00:00 committed by android-build-merger
parent ab382d6340 d8991a4624
commit 57da072401
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
msm8996/sdm/libs/hwc2/hwc_display.cpp
View File

@ -364,15 +364,6 @@ void HWCDisplay::BuildLayerStack() {
layer_stack_.flags.skip_present = true;
}
if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::Cursor) {
// Currently we support only one HWCursor & only at top most z-order
if ((*layer_set_.rbegin())->GetId() == hwc_layer->GetId()) {
layer->flags.cursor = true;
layer_stack_.flags.cursor_present = true;
}
}
// TODO(user): Move to a getter if this is needed at other places
hwc_rect_t scaled_display_frame = {INT(layer->dst_rect.left), INT(layer->dst_rect.top),
INT(layer->dst_rect.right), INT(layer->dst_rect.bottom)};
@ -1391,8 +1382,26 @@ HWC2::Error HWCDisplay::SetCursorPosition(hwc2_layer_t layer, int x, int y) {
return HWC2::Error::None;
}
// TODO(user): Validate layer
// TODO(user): Check if we're in a validate/present cycle
HWCLayer *hwc_layer = GetHWCLayer(layer);
if (hwc_layer == nullptr) {
return HWC2::Error::BadLayer;
}
if (hwc_layer->GetDeviceSelectedCompositionType() != HWC2::Composition::Cursor) {
return HWC2::Error::BadLayer;
}
if (validated_ == true) {
// the device is currently in the middle of the validate/present sequence,
// cannot set the Position(as per HWC2 spec)
return HWC2::Error::NotValidated;
}
DisplayState state;
if (display_intf_->GetDisplayState(&state) == kErrorNone) {
if (state != kStateOn) {
return HWC2::Error::None;
}
}
auto error = display_intf_->SetCursorPosition(x, y);
if (error != kErrorNone) {