summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-02-04 09:44:17 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-02-04 09:44:17 -0500
commit1486c7053ac09ee1b3ca6e884eeea424198a2f0e (patch)
treefdcc14a7b9c025e3c5a581334eaf69d22cd2e24d /src/lib/ecore_drm
parentb8ceaf0d403ce640ed6a485a59a3bd5a7b06a260 (diff)
This should not have been pushed. Unsure what happened here, but
revert this Revert "ecore-drm: Add opaque type for Plane support" This reverts commit 94082f54e8ce7d47402ea5d8d57e3871f8fa98a4.
Diffstat (limited to 'src/lib/ecore_drm')
-rw-r--r--src/lib/ecore_drm/Ecore_Drm.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index 249fc17..0366899 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -69,13 +69,6 @@ typedef enum _Ecore_Drm_Seat_Capabilities
69 EVDEV_SEAT_TOUCH = (1 << 2), 69 EVDEV_SEAT_TOUCH = (1 << 2),
70} Ecore_Drm_Seat_Capabilities; 70} Ecore_Drm_Seat_Capabilities;
71 71
72typedef enum _Ecore_Drm_Plane_Type
73{
74 ECORE_DRM_PLANE_TYPE_OVERLAY,
75 ECORE_DRM_PLANE_TYPE_PRIMARY,
76 ECORE_DRM_PLANE_TYPE_CURSOR
77} Ecore_Drm_Plane_Type;
78
79/* structure for fb objects */ 72/* structure for fb objects */
80typedef struct _Ecore_Drm_Fb 73typedef struct _Ecore_Drm_Fb
81{ 74{
@@ -215,10 +208,6 @@ typedef struct _Ecore_Drm_Event_Output Ecore_Drm_Event_Output;
215/** @since 1.14 */ 208/** @since 1.14 */
216typedef void (*Ecore_Drm_Pageflip_Cb)(void *data); 209typedef void (*Ecore_Drm_Pageflip_Cb)(void *data);
217 210
218/* opaque structure to represent a drm hardware plane */
219/** @since 1.18 */
220typedef struct _Ecore_Drm_Plane Ecore_Drm_Plane;
221
222EAPI extern int ECORE_DRM_EVENT_ACTIVATE; 211EAPI extern int ECORE_DRM_EVENT_ACTIVATE;
223 212
224EAPI extern int ECORE_DRM_EVENT_OUTPUT; /**< @since 1.14 */ 213EAPI extern int ECORE_DRM_EVENT_OUTPUT; /**< @since 1.14 */
@@ -1013,10 +1002,11 @@ EAPI Eina_Bool ecore_drm_output_possible_crtc_get(Ecore_Drm_Output *output, unsi
1013 */ 1002 */
1014EAPI Eina_Bool ecore_drm_output_mode_set(Ecore_Drm_Output *output, Ecore_Drm_Output_Mode *mode, int x, int y); 1003EAPI Eina_Bool ecore_drm_output_mode_set(Ecore_Drm_Output *output, Ecore_Drm_Output_Mode *mode, int x, int y);
1015 1004
1016/* TODO: Doxy */ 1005/* TODO: doxy */
1017/* @since 1.18 */ 1006/* @since 1.18 */
1018EAPI unsigned int ecore_drm_output_supported_rotations_get(Ecore_Drm_Output *output, Ecore_Drm_Plane_Type type); 1007EAPI unsigned int ecore_drm_output_supported_rotations_get(Ecore_Drm_Output *output, Ecore_Drm_Plane_Type type);
1019 1008
1009/* TODO: doxy */
1020/* @since 1.18 */ 1010/* @since 1.18 */
1021EAPI Eina_Bool ecore_drm_output_rotation_set(Ecore_Drm_Output *output, Ecore_Drm_Plane_Type type, unsigned int rotation); 1011EAPI Eina_Bool ecore_drm_output_rotation_set(Ecore_Drm_Output *output, Ecore_Drm_Plane_Type type, unsigned int rotation);
1022 1012