diff options
author | Hermet Park <hermetpark@gmail.com> | 2019-04-25 16:56:40 +0900 |
---|---|---|
committer | Hermet Park <hermetpark@gmail.com> | 2019-04-25 16:56:40 +0900 |
commit | 53599a8d399c21b467316033dd57907188339623 (patch) | |
tree | 79f5865b79b95a53040caf6097748d40105d7148 /src/lib/ecore_evas | |
parent | 2e85c6ba344852242290bac55621a9d0e6e0829f (diff) |
ecore wayland: expand internal interface to pass engine option list.
This is a prepartion patch to support msaa in wayland.
ui window needs to deliver engine options (stencil, depth, msaa bits)
to evas engine side, ecore_evas_wayland_egl should have the argument to pass.
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 10 | ||||
-rw-r--r-- | src/lib/ecore_evas/ecore_evas_private.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 8f8a0241b6..86020876ef 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -4462,7 +4462,7 @@ ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent, | |||
4462 | int x, int y, int w, int h, Eina_Bool frame) | 4462 | int x, int y, int w, int h, Eina_Bool frame) |
4463 | { | 4463 | { |
4464 | Ecore_Evas *ee; | 4464 | Ecore_Evas *ee; |
4465 | Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool); | 4465 | Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool, const int*); |
4466 | Eina_Module *m = _ecore_evas_engine_load("wayland"); | 4466 | Eina_Module *m = _ecore_evas_engine_load("wayland"); |
4467 | EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); | 4467 | EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); |
4468 | 4468 | ||
@@ -4471,7 +4471,7 @@ ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent, | |||
4471 | 4471 | ||
4472 | if (parent) ERR("Wayland windows with parents not supported through legacy API"); | 4472 | if (parent) ERR("Wayland windows with parents not supported through legacy API"); |
4473 | 4473 | ||
4474 | ee = new(disp_name, 0, x, y, w, h, frame); | 4474 | ee = new(disp_name, 0, x, y, w, h, frame, NULL); |
4475 | if (!_ecore_evas_cursors_init(ee)) | 4475 | if (!_ecore_evas_cursors_init(ee)) |
4476 | { | 4476 | { |
4477 | ecore_evas_free(ee); | 4477 | ecore_evas_free(ee); |
@@ -4503,17 +4503,17 @@ _wayland_shm_new(const char *disp_name, Ecore_Window parent, | |||
4503 | 4503 | ||
4504 | Ecore_Evas * | 4504 | Ecore_Evas * |
4505 | _wayland_egl_new(const char *disp_name, Ecore_Window parent, | 4505 | _wayland_egl_new(const char *disp_name, Ecore_Window parent, |
4506 | int x, int y, int w, int h, Eina_Bool frame) | 4506 | int x, int y, int w, int h, Eina_Bool frame, const int *opt) |
4507 | { | 4507 | { |
4508 | Ecore_Evas *ee; | 4508 | Ecore_Evas *ee; |
4509 | Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool); | 4509 | Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool, const int *); |
4510 | Eina_Module *m = _ecore_evas_engine_load("wayland"); | 4510 | Eina_Module *m = _ecore_evas_engine_load("wayland"); |
4511 | EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); | 4511 | EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); |
4512 | 4512 | ||
4513 | new = eina_module_symbol_get(m, "ecore_evas_wayland_egl_new_internal"); | 4513 | new = eina_module_symbol_get(m, "ecore_evas_wayland_egl_new_internal"); |
4514 | EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); | 4514 | EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); |
4515 | 4515 | ||
4516 | ee = new(disp_name, parent, x, y, w, h, frame); | 4516 | ee = new(disp_name, parent, x, y, w, h, frame, opt); |
4517 | if (!_ecore_evas_cursors_init(ee)) | 4517 | if (!_ecore_evas_cursors_init(ee)) |
4518 | { | 4518 | { |
4519 | ecore_evas_free(ee); | 4519 | ecore_evas_free(ee); |
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index 9149c3e937..cfbb367e2b 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h | |||
@@ -499,7 +499,7 @@ EAPI void ecore_evas_done(Ecore_Evas *ee, Eina_Bool single_window); | |||
499 | 499 | ||
500 | #ifdef IPA_YLNO_ESU_LANRETNI_MLE | 500 | #ifdef IPA_YLNO_ESU_LANRETNI_MLE |
501 | EAPI Ecore_Evas *_wayland_shm_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame); | 501 | EAPI Ecore_Evas *_wayland_shm_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame); |
502 | EAPI Ecore_Evas *_wayland_egl_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame); | 502 | EAPI Ecore_Evas *_wayland_egl_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt); |
503 | #else | 503 | #else |
504 | #define _wayland_shm_new DONT_USE_INTERNAL_API | 504 | #define _wayland_shm_new DONT_USE_INTERNAL_API |
505 | #define _wayland_egl_new DONT_USE_INTERNAL_API | 505 | #define _wayland_egl_new DONT_USE_INTERNAL_API |