tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev

Browse source 
* commit '4ed61b22e046ed544f6afb50abd0af25d478d8b1':
  Move virtual displays out of HWC 1.2, mark experimental
This commit is contained in:
Jesse Hall 2013-05-08 13:57:55 -07:00 committed by Android Git Automerger
commit f20cae6b94
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/hardware/hwcomposer.h
View file

@ -299,7 +299,8 @@ typedef struct hwc_display_contents_1 {
hwc_surface_t sur; hwc_surface_t sur;
}; };
/* Fields only relevant for HWC_DEVICE_VERSION_1_2 and later. */ /* WARNING: These fields are for experimental virtual display support,
* and are not currently used. */
struct { struct {
/* outbuf is the buffer that receives the composed image for /* outbuf is the buffer that receives the composed image for
* virtual displays. Writes to the outbuf must wait until * virtual displays. Writes to the outbuf must wait until
@ -307,6 +308,13 @@ typedef struct hwc_display_contents_1 {
* writes to outbuf are complete should be returned in * writes to outbuf are complete should be returned in
* retireFenceFd. * retireFenceFd.
* *
* This field will not be updated until after prepare(). If
* prepare() sets all non-FB layers to OVERLAY or sets all non-FB
* layers to FRAMEBUFFER, then the FRAMEBUFFER_TARGET buffer and
* the output buffer may be the same. In mixed OVERLAY/FRAMEBUFFER
* configurations they will have different buffers so the
* h/w composer does not have to read and write the same buffer.
*
* For physical displays, outbuf will be NULL. * For physical displays, outbuf will be NULL.
*/ */
buffer_handle_t outbuf; buffer_handle_t outbuf;
@ -428,10 +436,9 @@ typedef struct hwc_composer_device_1 {
* For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries * For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries
* for unsupported or disabled/disconnected display types will be NULL. * for unsupported or disabled/disconnected display types will be NULL.
* *
* For HWC 1.2 and later, numDisplays will be HWC_NUM_DISPLAY_TYPES or more. * In a future version, numDisplays may be larger than
* The extra entries correspond to enabled virtual displays, and will be * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual
* non-NULL. In HWC 1.2, support for one virtual display is required, and * displays, and will be non-NULL.
* no more than one will be used. Future HWC versions might require more.
* *
* returns: 0 on success. An negative error code on error. If an error is * 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 * returned, SurfaceFlinger will assume that none of the layer will be
@ -462,10 +469,9 @@ typedef struct hwc_composer_device_1 {
* For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries * For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries
* for unsupported or disabled/disconnected display types will be NULL. * for unsupported or disabled/disconnected display types will be NULL.
* *
* For HWC 1.2 and later, numDisplays will be HWC_NUM_DISPLAY_TYPES or more. * In a future version, numDisplays may be larger than
* The extra entries correspond to enabled virtual displays, and will be * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual
* non-NULL. In HWC 1.2, support for one virtual display is required, and * displays, and will be non-NULL.
* no more than one will be used. Future HWC versions might require more.
* *
* IMPORTANT NOTE: There is an implicit layer containing opaque black * IMPORTANT NOTE: There is an implicit layer containing opaque black
* pixels behind all the layers in the list. It is the responsibility of * pixels behind all the layers in the list. It is the responsibility of