diff options
author | Jesse Hall <jessehall@google.com> | 2012-08-20 16:34:02 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 16:34:03 -0700 |
commit | 43923defb76b01a84e10f72de80e79a31ad68365 (patch) | |
tree | 7d8495c245c531f2940e7c21f5b84966cb35c8f6 /include/hardware/hwcomposer.h | |
parent | 705d2912b70ae0dc8d035d475cf75f64c1a4c4b6 (diff) | |
parent | d18c83fc044a5f1d74ebe59bea7763b75c4d00d7 (diff) | |
download | hardware_libhardware-43923defb76b01a84e10f72de80e79a31ad68365.zip hardware_libhardware-43923defb76b01a84e10f72de80e79a31ad68365.tar.gz hardware_libhardware-43923defb76b01a84e10f72de80e79a31ad68365.tar.bz2 |
Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-dev
Diffstat (limited to 'include/hardware/hwcomposer.h')
-rw-r--r-- | include/hardware/hwcomposer.h | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/include/hardware/hwcomposer.h b/include/hardware/hwcomposer.h index 91ee504..27b9197 100644 --- a/include/hardware/hwcomposer.h +++ b/include/hardware/hwcomposer.h @@ -115,20 +115,30 @@ typedef struct hwc_color { typedef struct hwc_layer_1 { /* - * initially set to HWC_FRAMEBUFFER or HWC_BACKGROUND. + * Initially set to HWC_FRAMEBUFFER, HWC_BACKGROUND, or + * HWC_FRAMEBUFFER_TARGET. + * * HWC_FRAMEBUFFER - * indicates the layer will be drawn into the framebuffer - * using OpenGL ES. - * The HWC can toggle this value to HWC_OVERLAY, to indicate - * it will handle the layer. + * Indicates the layer will be drawn into the framebuffer + * using OpenGL ES. The HWC can toggle this value to HWC_OVERLAY to + * indicate it will handle the layer. * * HWC_BACKGROUND - * indicates this is a special "background" layer. The only valid - * field is backgroundColor. HWC_BACKGROUND can only be used with - * HWC_API_VERSION >= 0.2 - * The HWC can toggle this value to HWC_FRAMEBUFFER, to indicate - * it CANNOT handle the background color + * Indicates this is a special "background" layer. The only valid field + * is backgroundColor. The HWC can toggle this value to HWC_FRAMEBUFFER + * to indicate it CANNOT handle the background color. + * + * HWC_FRAMEBUFFER_TARGET + * Indicates this layer is the framebuffer surface used as the target of + * OpenGL ES composition. If the HWC sets all other layers to HWC_OVERLAY + * or HWC_BACKGROUND, then no OpenGL ES composition will be done, and + * this layer should be ignored during set(); the HWC_SKIP_LAYER flag + * will indicate this case. * + * This flag (and the framebuffer surface layer) will only be used if the + * HWC version is HWC_DEVICE_API_VERSION_1_1 or higher. In older versions, + * the OpenGL ES target surface is communicated by the (dpy, sur) fields + * in hwc_compositor_device_1_t. */ int32_t compositionType; @@ -246,9 +256,13 @@ typedef struct hwc_display_contents_1 { */ int flipFenceFd; - /* (dpy, sur) is the target of SurfaceFlinger's OpenGL ES composition. - * They aren't relevant to prepare. The set call should commit this surface - * atomically to the display along with any overlay layers. + /* (dpy, sur) is the target of SurfaceFlinger's OpenGL ES composition for + * HWC versions before HWC_DEVICE_VERSION_1_1. They aren't relevant to + * prepare. The set call should commit this surface atomically to the + * display along with any overlay layers. + * + * For HWC_DEVICE_VERSION_1_1 and later, these will always be set to + * EGL_NO_DISPLAY and EGL_NO_SURFACE. */ hwc_display_t dpy; hwc_surface_t sur; |