summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 14:52:41 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 14:52:41 +0100
commitc05aae8ad1800b23cfbc797b8c9c6136316e975b (patch)
tree81dc97dcde42f5585cfc25217a197ee2525aeb8a
parent841bce366de0ea0a3418476e9b97f2389b96df6c (diff)
parent18396d486dfc07119706370f6e3256bc6de88d30 (diff)
downloadhardware_libhardware-c05aae8ad1800b23cfbc797b8c9c6136316e975b.tar.gz
hardware_libhardware-c05aae8ad1800b23cfbc797b8c9c6136316e975b.tar.bz2
hardware_libhardware-c05aae8ad1800b23cfbc797b8c9c6136316e975b.zip
Merge remote-tracking branch 'cyanogenmod/cm-13.0' into HEAD
-rw-r--r--include/hardware/hwcomposer_defs.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h
index 9c7d790..a90822a 100644
--- a/include/hardware/hwcomposer_defs.h
+++ b/include/hardware/hwcomposer_defs.h
@@ -207,17 +207,26 @@ enum {
enum {
HWC_DISPLAY_PRIMARY = 0,
HWC_DISPLAY_EXTERNAL = 1, // HDMI, DP, etc.
+#ifdef QTI_BSP
HWC_DISPLAY_TERTIARY = 2,
HWC_DISPLAY_VIRTUAL = 3,
HWC_NUM_PHYSICAL_DISPLAY_TYPES = 3,
HWC_NUM_DISPLAY_TYPES = 4,
+#else
+ HWC_DISPLAY_VIRTUAL = 2,
+
+ HWC_NUM_PHYSICAL_DISPLAY_TYPES = 2,
+ HWC_NUM_DISPLAY_TYPES = 3,
+#endif
};
enum {
HWC_DISPLAY_PRIMARY_BIT = 1 << HWC_DISPLAY_PRIMARY,
HWC_DISPLAY_EXTERNAL_BIT = 1 << HWC_DISPLAY_EXTERNAL,
+#ifdef QTI_BSP
HWC_DISPLAY_TERTIARY_BIT = 1 << HWC_DISPLAY_TERTIARY,
+#endif
HWC_DISPLAY_VIRTUAL_BIT = 1 << HWC_DISPLAY_VIRTUAL,
};