summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/eglfs/evas_engine.c11
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c11
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c15
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c14
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c10
5 files changed, 19 insertions, 42 deletions
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c
index 34aa22fbe5..d4af49c43d 100644
--- a/src/modules/evas/engines/eglfs/evas_engine.c
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -912,19 +912,14 @@ eng_image_native_set(void *engine EINA_UNUSED, void *data, void *image, void *na
912 } 912 }
913 } 913 }
914 914
915 if ((!ns) && (!img->native.data)) return img;
916
917 evas_outbuf_use(ob); 915 evas_outbuf_use(ob);
918 916
919 if (img->native.data) 917 if (!ns)
920 { 918 {
921 if (img->native.func.free) 919 glsym_evas_gl_common_image_free(img);
922 img->native.func.free(img); 920 return NULL;
923 glsym_evas_gl_common_image_native_disable(img);
924 } 921 }
925 922
926 if (!ns) return img;
927
928 if (ns->type == EVAS_NATIVE_SURFACE_WL) 923 if (ns->type == EVAS_NATIVE_SURFACE_WL)
929 { 924 {
930 wlid = wl_buf; 925 wlid = wl_buf;
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index ed6a8e7b89..6877842008 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1223,19 +1223,14 @@ eng_image_native_set(void *engine, void *image, void *native)
1223 } 1223 }
1224 } 1224 }
1225 1225
1226 if ((!ns) && (!img->native.data)) return img;
1227
1228 evas_outbuf_use(ob); 1226 evas_outbuf_use(ob);
1229 1227
1230 if (img && img->native.data) 1228 if (!ns)
1231 { 1229 {
1232 if (img->native.func.free) 1230 glsym_evas_gl_common_image_free(img);
1233 img->native.func.free(img); 1231 return NULL;
1234 glsym_evas_gl_common_image_native_disable(img);
1235 } 1232 }
1236 1233
1237 if (!ns) return img;
1238
1239 if (ns->type == EVAS_NATIVE_SURFACE_WL_DMABUF) 1234 if (ns->type == EVAS_NATIVE_SURFACE_WL_DMABUF)
1240 { 1235 {
1241 wlid = wl_buf; 1236 wlid = wl_buf;
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 311077909c..617ef47f73 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -484,18 +484,13 @@ eng_image_native_set(void *engine, void *image, void *native)
484 } 484 }
485 } 485 }
486 } 486 }
487 if ((!ns) && (!im->native.data)) return im;
488
489 gl_generic_window_find(engine); 487 gl_generic_window_find(engine);
490 488
491 if (im->native.data) 489 if (!ns)
492 { 490 {
493 if (im->native.func.free) 491 evas_gl_common_image_free(im);
494 im->native.func.free(im); 492 return NULL;
495 evas_gl_common_image_native_disable(im); 493 }
496 }
497
498 if (!ns) return im;
499 494
500 if (ns->type == EVAS_NATIVE_SURFACE_OPENGL) 495 if (ns->type == EVAS_NATIVE_SURFACE_OPENGL)
501 { 496 {
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index eb55c7720a..b76b3d51b4 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -2384,16 +2384,12 @@ eng_image_native_set(void *engine, void *image, void *native)
2384#endif 2384#endif
2385 } 2385 }
2386 } 2386 }
2387 if ((!ns) && (!im->native.data)) return im; 2387 if (!ns)
2388 2388 {
2389 if (im->native.data) 2389 glsym_evas_gl_common_image_free(im);
2390 { 2390 return NULL;
2391 if (im->native.func.free) 2391 }
2392 im->native.func.free(im);
2393 glsym_evas_gl_common_image_native_disable(im);
2394 }
2395 2392
2396 if (!ns) return im;
2397 2393
2398 if (ns->type == EVAS_NATIVE_SURFACE_X11) 2394 if (ns->type == EVAS_NATIVE_SURFACE_X11)
2399 { 2395 {
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 4f22f8a787..e26205e304 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1083,18 +1083,14 @@ eng_image_native_set(void *engine, void *image, void *native)
1083 } 1083 }
1084 } 1084 }
1085 1085
1086 if ((!ns) && (!img->native.data)) return img;
1087
1088 eng_window_use(ob); 1086 eng_window_use(ob);
1089 1087
1090 if (img->native.data) 1088 if (!ns)
1091 { 1089 {
1092 if (img->native.func.free) 1090 glsym_evas_gl_common_image_free(img);
1093 img->native.func.free(img); 1091 return NULL;
1094 glsym_evas_gl_common_image_native_disable(img);
1095 } 1092 }
1096 1093
1097 if (!ns) return img;
1098 1094
1099 if (ns->type == EVAS_NATIVE_SURFACE_WL) 1095 if (ns->type == EVAS_NATIVE_SURFACE_WL)
1100 { 1096 {