summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 15:44:19 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 15:55:26 -0700
commit6d1d47d50d4b7d2cf5c86f3e339dd2e9c9482132 (patch)
treed1d711e8c4a2e7093f93c29f29ce1a8696bf8e84 /src/modules
parent27cba99045db1896c7600c26907fd90f84e24ff7 (diff)
evas: fix build with egl.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c21
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c4
2 files changed, 20 insertions, 5 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 6872fe4..dab1738 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -137,6 +137,21 @@ _context_stored_reset(void *data EINA_UNUSED, void *surface)
137#define CONTEXT_STORE(data, surface, context) _context_store(data, surface, context) 137#define CONTEXT_STORE(data, surface, context) _context_store(data, surface, context)
138#define CONTEXT_STORED_RESET(data, surface) _context_stored_reset(data, surface) 138#define CONTEXT_STORED_RESET(data, surface) _context_stored_reset(data, surface)
139 139
140#ifdef GL_GLES
141static void *
142egl_display_get(Render_Engine_GL_Generic *engine)
143{
144 Render_Output_GL_Generic *output;
145 Eina_List *l;
146
147 EINA_LIST_FOREACH(engine->software.outputs, l, output)
148 if (output->software.ob)
149 return output->window_egl_display_get(output->software.ob);
150
151 return NULL;
152}
153#endif
154
140static void * 155static void *
141eng_engine_new(void) 156eng_engine_new(void)
142{ 157{
@@ -796,7 +811,7 @@ eng_image_data_get(void *engine, void *image, int to_write, DATA32 **image_data,
796 } 811 }
797 else if ((im->gc->shared->info.sec_image_map) && (secsym_eglMapImageSEC)) 812 else if ((im->gc->shared->info.sec_image_map) && (secsym_eglMapImageSEC))
798 { 813 {
799 void *disp = re->window_egl_display_get(re->software.ob); 814 void *disp = egl_display_get(engine);
800 *image_data = im->tex->pt->dyn.data = secsym_eglMapImageSEC(disp, 815 *image_data = im->tex->pt->dyn.data = secsym_eglMapImageSEC(disp,
801 im->tex->pt->dyn.img, 816 im->tex->pt->dyn.img,
802 EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC, 817 EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC,
@@ -1000,7 +1015,7 @@ eng_image_data_put(void *engine, void *image, DATA32 *image_data)
1000 } 1015 }
1001 else if (im->gc->shared->info.sec_image_map) 1016 else if (im->gc->shared->info.sec_image_map)
1002 { 1017 {
1003 void *disp = disp = re->window_egl_display_get(re->software.ob); 1018 void *disp = disp = egl_display_get(engine);
1004 secsym_eglUnmapImageSEC(disp, im->tex->pt->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC); 1019 secsym_eglUnmapImageSEC(disp, im->tex->pt->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC);
1005 } 1020 }
1006 } 1021 }
@@ -1869,7 +1884,7 @@ eng_gl_surface_query(void *eng, void *surface, int attr, void *value)
1869 Eina_Bool ok; 1884 Eina_Bool ok;
1870 void *disp; 1885 void *disp;
1871 1886
1872 disp = re->window_egl_display_get(re->software.ob); 1887 disp = egl_display_get(engine);
1873 ok = eglQuerySurface(disp, sfc->pbuffer.native_surface, attr, &val); 1888 ok = eglQuerySurface(disp, sfc->pbuffer.native_surface, attr, &val);
1874 if (!ok) return EINA_FALSE; 1889 if (!ok) return EINA_FALSE;
1875 switch (attr) 1890 switch (attr)
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index be50952..c640f6c 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -505,9 +505,9 @@ static const EVGL_Interface evgl_funcs =
505static void 505static void
506eng_output_info_setup(void *info) 506eng_output_info_setup(void *info)
507{ 507{
508 Evas_Engine_Info_Wayland *info = info; 508 Evas_Engine_Info_Wayland *in = info;
509 509
510 info->render_mode = EVAS_RENDER_MODE_BLOCKING; 510 in->render_mode = EVAS_RENDER_MODE_BLOCKING;
511} 511}
512 512
513static Render_Output_Swap_Mode 513static Render_Output_Swap_Mode