summaryrefslogtreecommitdiff
path: root/src/lib/evas/Evas_Common.h
diff options
context:
space:
mode:
authorMun, Gwan-gyeong <kk.moon@samsung.com>2014-12-04 17:59:30 +0900
committerGwanglim Lee <gl77.lee@samsung.com>2014-12-04 17:59:30 +0900
commitd1b8d52e0edd5de0e0c152021affd2c3c43775d7 (patch)
tree9d82fc499fe1a3a7cce19b2302a3c97205d32e96 /src/lib/evas/Evas_Common.h
parent83512198b893845b25c4f5afd49dbea945809ead (diff)
evas/gl_drm: add native surface for wayland_egl_client.
Reviewers: zmike, devilhorns, cedric, gwanglim Reviewed By: cedric, gwanglim Subscribers: jpeg, torori, cedric Differential Revision: https://phab.enlightenment.org/D1507
Diffstat (limited to 'src/lib/evas/Evas_Common.h')
-rw-r--r--src/lib/evas/Evas_Common.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index dfffa14a9b..722bb0cc57 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -461,7 +461,7 @@ struct _Evas_Pixel_Import_Source
461 * Magic version number to know what the native surface struct looks like 461 * Magic version number to know what the native surface struct looks like
462 */ 462 */
463 463
464#define EVAS_NATIVE_SURFACE_VERSION 2 464#define EVAS_NATIVE_SURFACE_VERSION 3
465 465
466/** 466/**
467 * Native surface types that image object supports 467 * Native surface types that image object supports
@@ -473,7 +473,8 @@ typedef enum _Evas_Native_Surface_Type
473{ 473{
474 EVAS_NATIVE_SURFACE_NONE, /**< No surface type */ 474 EVAS_NATIVE_SURFACE_NONE, /**< No surface type */
475 EVAS_NATIVE_SURFACE_X11, /**< X Window system based type. pixmap id or visual of the pixmap */ 475 EVAS_NATIVE_SURFACE_X11, /**< X Window system based type. pixmap id or visual of the pixmap */
476 EVAS_NATIVE_SURFACE_OPENGL /**< OpenGL system based type. texture or framebuffer id*/ 476 EVAS_NATIVE_SURFACE_OPENGL, /**< OpenGL system based type. texture or framebuffer id*/
477 EVAS_NATIVE_SURFACE_WL /**< Wayland system based type. buffer of surface */
477} Evas_Native_Surface_Type; 478} Evas_Native_Surface_Type;
478 479
479/** 480/**
@@ -484,7 +485,9 @@ typedef enum _Evas_Native_Surface_Type
484 * EVAS_NATIVE_SURFACE_X11, you need to set union data with x11.visual or 485 * EVAS_NATIVE_SURFACE_X11, you need to set union data with x11.visual or
485 * x11.pixmap. If you need to set the native surface as 486 * x11.pixmap. If you need to set the native surface as
486 * EVAS_NATIVE_SURFACE_OPENGL, on the other hand, you need to set union data 487 * EVAS_NATIVE_SURFACE_OPENGL, on the other hand, you need to set union data
487 * with opengl.texture_id or opengl.framebuffer_id and so on. The version field 488 * with opengl.texture_id or opengl.framebuffer_id and so on.
489 * If you need to set the native surface as EVAS_NATIVE_SURFACE_WL,
490 * you need to set union data with wl.legacy_buffer. The version field
488 * should be set with EVAS_NATIVE_SURFACE_VERSION in order to check abi 491 * should be set with EVAS_NATIVE_SURFACE_VERSION in order to check abi
489 * break in your application on the different efl library versions. 492 * break in your application on the different efl library versions.
490 * 493 *
@@ -518,6 +521,10 @@ struct _Evas_Native_Surface
518 unsigned int format; /**< same as 'format' for glTexImage2D() */ 521 unsigned int format; /**< same as 'format' for glTexImage2D() */
519 unsigned int x, y, w, h; /**< region inside the texture to use (image size is assumed as texture size, with 0, 0 being the top-left and co-ordinates working down to the right and bottom being positive) */ 522 unsigned int x, y, w, h; /**< region inside the texture to use (image size is assumed as texture size, with 0, 0 being the top-left and co-ordinates working down to the right and bottom being positive) */
520 } opengl; /**< Set this struct fields if surface data is OpenGL based. */ 523 } opengl; /**< Set this struct fields if surface data is OpenGL based. */
524 struct
525 {
526 void *legacy_buffer; /**< wayland client buffer to use */
527 } wl; /**< Set this struct fields if surface data is Wayland based. */
521 } data; /**< Choose one union data according to your surface. */ 528 } data; /**< Choose one union data according to your surface. */
522}; 529};
523 530