sdm: Fix hwc2 compilation
- Remove marking hdr flags in hwc2 as HDR features
needs having tonemapper included, until that don't
tag any layers are HDR
- Include hwc socket handler in HWCSession
Change-Id: Ia560e9e21ef8e73ba81844bed7dde849381bdf61
Crs-fixed: 1110393
diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index f603f18..08b1aaa 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 @@
}
}
- 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 43ae0cc..befc96c 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 {