hwc: add TDM_COMPOSITION_NONE

use TDM_COMPOSITION_NONE insted TDM_HWC_WINDOW_FLAG_SKIP

Change-Id: I8e1959cd953dc38e9dc77ce6c5193659cc8e838c

diff --git a/include/tdm_common.h b/include/tdm_common.h
index 84549f3..637d883 100644 (file)
--- a/include/tdm_common.h
+++ b/include/tdm_common.h
@@ -306,7 +306,7 @@ typedef union {
  * @since 2.0.0
  */
 typedef enum {
  * @since 2.0.0
  */
 typedef enum {

-       TDM_HWC_WINDOW_FLAG_SKIP     = (1 << 0),
+       TDM_HWC_WINDOW_FLAG_NONE     = 0,

 } tdm_hwc_window_flag;
 
 #ifdef __cplusplus
 } tdm_hwc_window_flag;
 
 #ifdef __cplusplus

diff --git a/include/tdm_types.h b/include/tdm_types.h
index 58a787f..626c1c3 100644 (file)
--- a/include/tdm_types.h
+++ b/include/tdm_types.h
@@ -143,6 +143,13 @@ typedef struct _tdm_info_capture {
  * @since 2.0.0
  */
 typedef enum {
  * @since 2.0.0
  */
 typedef enum {

+
+       /** Set by the client for an invisible window. The value by default.
+        *
+        * The device ignores windows of this type.
+        */
+       TDM_COMPOSITION_NONE = 0,
+

        /** The client will composite this window into the client target window
         *
         * User can choose this type for window to avoid a hardware composition for
        /** The client will composite this window into the client target window
         *
         * User can choose this type for window to avoid a hardware composition for


@@ -154,7 +161,7 @@ typedef enum {
         * The device must not request any composition type changes for windows of
         * this type.
         */
         * The device must not request any composition type changes for windows of
         * this type.
         */

-       TDM_COMPOSITION_CLIENT = 0,
+       TDM_COMPOSITION_CLIENT = 1,

 
        /* Set by the HWC after tdm_output_hwc_validate().
         *
 
        /* Set by the HWC after tdm_output_hwc_validate().
         *


@@ -187,13 +194,14 @@ typedef enum {
         * window to the TDM_COMPOSITION_CLIENT type, it causes a type of this window being changed
         * to TDM_COMPOSITION_CLIENT.
         */
         * window to the TDM_COMPOSITION_CLIENT type, it causes a type of this window being changed
         * to TDM_COMPOSITION_CLIENT.
         */

-       TDM_COMPOSITION_CLIENT_CANDIDATE = 5,
+       TDM_COMPOSITION_CLIENT_CANDIDATE = 2,
+

 
        /** Set by the client before tdm_output_hwc_validate().
         *
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. */
 
        /** Set by the client before tdm_output_hwc_validate().
         *
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. */

-       TDM_COMPOSITION_DEVICE_CANDIDATE = 2,
+       TDM_COMPOSITION_DEVICE_CANDIDATE = 3,

 
        /** Set by the HWC after tdm_output_hwc_validate().
         *
 
        /** Set by the HWC after tdm_output_hwc_validate().
         *


@@ -202,7 +210,7 @@ typedef enum {
         *
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * TDM_COMPOSITION_CLIENT or TDM_COMPOSITION_DEVICE_CANDIDATE. */
         *
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * TDM_COMPOSITION_CLIENT or TDM_COMPOSITION_DEVICE_CANDIDATE. */

-       TDM_COMPOSITION_DEVICE = 1,
+       TDM_COMPOSITION_DEVICE = 4,

 
        /** Similar to DEVICE, but the position of this layer may also be set
         * asynchronously through layer_set_cursor_position. If this functionality is not
 
        /** Similar to DEVICE, but the position of this layer may also be set
         * asynchronously through layer_set_cursor_position. If this functionality is not


@@ -214,7 +222,7 @@ typedef enum {
         * either TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. Changing to
         * TDM_COMPOSITION_DEVICE will prevent the use of layer_set_cursor_position but
         * still permit the device to composite the layer. */
         * either TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. Changing to
         * TDM_COMPOSITION_DEVICE will prevent the use of layer_set_cursor_position but
         * still permit the device to composite the layer. */

-       TDM_COMPOSITION_CURSOR = 3,
+       TDM_COMPOSITION_CURSOR = 5,

 
        /** The device will handle the composition of this layer through a hardware
         * overlay or other similar means.
 
        /** The device will handle the composition of this layer through a hardware
         * overlay or other similar means.


@@ -222,7 +230,7 @@ typedef enum {
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * either TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT, but it is
         * unlikely that content will display correctly in these cases. */
         * Upon tdm_output_hwc_validate(), the device may request a change from this type to
         * either TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT, but it is
         * unlikely that content will display correctly in these cases. */

-       TDM_COMPOSITION_VIDEO = 4,
+       TDM_COMPOSITION_VIDEO = 6,

 } tdm_hwc_window_composition;
 
 /**
 } tdm_hwc_window_composition;
 
 /**