From fc0ff2a8700eb11aef7a961b279d846c8a1c04c5 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Fri, 16 Aug 2013 11:13:36 -0700 Subject: Add HWC_DISPLAY_VIRTUAL and adjust display count constants Both surfaceflinger and HWC implementations have been defining these themselves, making future changes more difficult. Better to define them centrally, where they can be updated easily. Change-Id: I793158b858c84b2470b05f9ea77cc5a0c7e247f1 --- include/hardware/hwcomposer.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include/hardware/hwcomposer.h') diff --git a/include/hardware/hwcomposer.h b/include/hardware/hwcomposer.h index 9492d3a..846bab4 100644 --- a/include/hardware/hwcomposer.h +++ b/include/hardware/hwcomposer.h @@ -449,12 +449,12 @@ typedef struct hwc_composer_device_1 { * For HWC 1.0, numDisplays will always be one, and displays[0] will be * non-NULL. * - * For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries - * for unsupported or disabled/disconnected display types will be NULL. + * For HWC 1.1, numDisplays will always be HWC_NUM_PHYSICAL_DISPLAY_TYPES. + * Entries for unsupported or disabled/disconnected display types will be + * NULL. * - * In a future version, numDisplays may be larger than - * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual - * displays, and will be non-NULL. + * In HWC 1.3, numDisplays may be up to HWC_NUM_DISPLAY_TYPES. The extra + * entries correspond to enabled virtual displays, and will be non-NULL. * * returns: 0 on success. An negative error code on error. If an error is * returned, SurfaceFlinger will assume that none of the layer will be @@ -482,12 +482,12 @@ typedef struct hwc_composer_device_1 { * For HWC 1.0, numDisplays will always be one, and displays[0] will be * non-NULL. * - * For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries - * for unsupported or disabled/disconnected display types will be NULL. + * For HWC 1.1, numDisplays will always be HWC_NUM_PHYSICAL_DISPLAY_TYPES. + * Entries for unsupported or disabled/disconnected display types will be + * NULL. * - * In a future version, numDisplays may be larger than - * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual - * displays, and will be non-NULL. + * In HWC 1.3, numDisplays may be up to HWC_NUM_DISPLAY_TYPES. The extra + * entries correspond to enabled virtual displays, and will be non-NULL. * * IMPORTANT NOTE: There is an implicit layer containing opaque black * pixels behind all the layers in the list. It is the responsibility of -- cgit v1.1