diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-13 13:04:08 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-13 13:04:08 -0800 |
| commit | 5bab554484633820d22b6c7411afb44ed12597a3 (patch) | |
| tree | f4bc2ecf20f3bb975b97c8171efa895e2f878cd8 | |
| parent | e05cb6caabf432eff499e2faf3756eece9441494 (diff) | |
| parent | e50252bcab548782d836538abcccef53b2ef73b6 (diff) | |
| download | display-5bab554484633820d22b6c7411afb44ed12597a3.tar.gz | |
Merge "sdm: Fix hwc2 compilation"
| -rw-r--r-- | sdm/libs/hwc2/hwc_display.cpp | 9 | ||||
| -rw-r--r-- | sdm/libs/hwc2/hwc_session.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp index f603f183..08b1aaab 100644 --- a/sdm/libs/hwc2/hwc_display.cpp +++ b/sdm/libs/hwc2/hwc_display.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * Not a Contribution. * * Copyright 2015 The Android Open Source Project @@ -363,13 +363,6 @@ void HWCDisplay::BuildLayerStack() { } } - if (layer->color_metadata.colorPrimaries == ColorPrimaries_BT2020 && - (layer->color_metadata.transfer == Transfer_SMPTE_ST2084 || - layer->color_metadata.transfer == Transfer_HLG)) { - layer->flags.hdr = true; - layer_stack_.flags.hdr_present = true; - } - if (layer->flags.skip) { layer_stack_.flags.skip_present = true; } diff --git a/sdm/libs/hwc2/hwc_session.h b/sdm/libs/hwc2/hwc_session.h index 43ae0ccc..befc96ce 100644 --- a/sdm/libs/hwc2/hwc_session.h +++ b/sdm/libs/hwc2/hwc_session.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * Not a Contribution. * * Copyright 2015 The Android Open Source Project @@ -30,6 +30,7 @@ #include "hwc_display_external.h" #include "hwc_display_virtual.h" #include "hwc_color_manager.h" +#include "hwc_socket_handler.h" namespace sdm { |