diff options
author | Sean Paul <seanpaul@chromium.org> | 2017-05-04 18:33:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-04 18:33:10 +0000 |
commit | da26231102aebeaee1f4282f533f10ca9275a86c (patch) | |
tree | 51aaa69d3ea93210d20912fc1b3ad45a353a1885 /drmhwctwo.cpp | |
parent | a3dc0d2f2acff5ed74f8ad5e0cc9195c8225e5da (diff) | |
parent | 4ab43739e556aab0e689005222f99d9b34e738d5 (diff) | |
download | drm_hwcomposer-da26231102aebeaee1f4282f533f10ca9275a86c.tar.gz |
Merge "drm_hwcomposer: Add support for GetColorModes & SetCursorPosition" am: b2a9617bc8 am: c604f0a549 am: 5c2a2479c1 am: 9a003f37b3
am: 4ab43739e5
Change-Id: Id5e173cbcdb3cd0b0f30fb5cf12dfae6a238be9e
Diffstat (limited to 'drmhwctwo.cpp')
-rw-r--r-- | drmhwctwo.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp index b13fce1..8c853f4 100644 --- a/drmhwctwo.cpp +++ b/drmhwctwo.cpp @@ -315,8 +315,13 @@ HWC2::Error DrmHwcTwo::HwcDisplay::GetClientTargetSupport(uint32_t width, HWC2::Error DrmHwcTwo::HwcDisplay::GetColorModes(uint32_t *num_modes, int32_t *modes) { supported(__func__); - // TODO: android_color_mode_t isn't defined yet! - return unsupported(__func__, num_modes, modes); + if (!modes) + *num_modes = 1; + + if (modes) + *modes = HAL_COLOR_MODE_NATIVE; + + return HWC2::Error::None; } HWC2::Error DrmHwcTwo::HwcDisplay::GetDisplayAttribute(hwc2_config_t config, @@ -626,8 +631,12 @@ HWC2::Error DrmHwcTwo::HwcDisplay::SetClientTarget(buffer_handle_t target, HWC2::Error DrmHwcTwo::HwcDisplay::SetColorMode(int32_t mode) { supported(__func__); - // TODO: android_color_mode_t isn't defined yet! - return unsupported(__func__, mode); + + if (mode != HAL_COLOR_MODE_NATIVE) + return HWC2::Error::Unsupported; + + color_mode_ = mode; + return HWC2::Error::None; } HWC2::Error DrmHwcTwo::HwcDisplay::SetColorTransform(const float *matrix, @@ -702,8 +711,9 @@ HWC2::Error DrmHwcTwo::HwcDisplay::ValidateDisplay(uint32_t *num_types, HWC2::Error DrmHwcTwo::HwcLayer::SetCursorPosition(int32_t x, int32_t y) { supported(__func__); - // TODO: Implement proper cursor support - return unsupported(__func__, x, y); + cursor_x_ = x; + cursor_y_ = y; + return HWC2::Error::None; } HWC2::Error DrmHwcTwo::HwcLayer::SetLayerBlendMode(int32_t mode) { |