summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-03 18:22:28 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-03 18:22:28 +0000
commite18af750f3407819c1bf5c7886a91635f09a40b6 (patch)
treeebb5886abb04ecadb77248c7437f5060226464e2
parentc836d827748af5b1cb21b3a08327edd0660cbdab (diff)
gl native surf - create pixmap failes - make them warns
these can be race conditions so really should be warns and not errors. they just are noise we'll never fix as it's racey anyway...
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c8
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index 8c1d601..281ec9f 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1459,7 +1459,7 @@ eng_image_native_set(void *engine, void *image, void *native)
1459 1459
1460 if (!n->ns_data.wl_surface.surface) 1460 if (!n->ns_data.wl_surface.surface)
1461 { 1461 {
1462 ERR("eglCreatePixmapSurface() for %p failed", wl_buf); 1462 WRN("eglCreatePixmapSurface() for %p failed", wl_buf);
1463 eina_hash_del(ob->gl_context->shared->native_wl_hash, 1463 eina_hash_del(ob->gl_context->shared->native_wl_hash,
1464 &wlid, img); 1464 &wlid, img);
1465 glsym_evas_gl_common_image_free(img); 1465 glsym_evas_gl_common_image_free(img);
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 1d63eaa..a22e9d9 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1964,7 +1964,7 @@ _native_bind_cb(void *image)
1964 (void *)n->ns_data.x11.pixmap, 1964 (void *)n->ns_data.x11.pixmap,
1965 NULL); 1965 NULL);
1966 if (!n->ns_data.x11.surface) 1966 if (!n->ns_data.x11.surface)
1967 ERR("eglCreateImage() for Pixmap 0x%#lx failed: %#x", n->ns_data.x11.pixmap, eglGetError()); 1967 WRN("eglCreateImage() for Pixmap 0x%#lx failed: %#x", n->ns_data.x11.pixmap, eglGetError());
1968 1968
1969 } 1969 }
1970 if (glsym_glEGLImageTargetTexture2DOES) 1970 if (glsym_glEGLImageTargetTexture2DOES)
@@ -2567,7 +2567,7 @@ eng_image_native_set(void *engine, void *image, void *native)
2567 2567
2568 if (!n->ns_data.x11.surface) 2568 if (!n->ns_data.x11.surface)
2569 { 2569 {
2570 ERR("eglCreateImage() for Pixmap %#lx failed: %#x", pm, eglGetError()); 2570 WRN("eglCreateImage() for Pixmap %#lx failed: %#x", pm, eglGetError());
2571 free(n); 2571 free(n);
2572 return NULL; 2572 return NULL;
2573 } 2573 }
@@ -2854,7 +2854,7 @@ eng_image_native_set(void *engine, void *image, void *native)
2854 else 2854 else
2855 ERR("Try eglCreateImage on EGL with no support"); 2855 ERR("Try eglCreateImage on EGL with no support");
2856 if (!n->ns_data.tbm.surface) 2856 if (!n->ns_data.tbm.surface)
2857 ERR("eglCreateImage() for %p failed", buffer); 2857 WRN("eglCreateImage() for %p failed", buffer);
2858 im->native.yinvert = 1; 2858 im->native.yinvert = 1;
2859 im->native.loose = 0; 2859 im->native.loose = 0;
2860 im->native.disp = ob->egl_disp; 2860 im->native.disp = ob->egl_disp;
@@ -2965,7 +2965,7 @@ eng_image_native_set(void *engine, void *image, void *native)
2965 2965
2966 if (!n->ns_data.wl_surface.surface) 2966 if (!n->ns_data.wl_surface.surface)
2967 { 2967 {
2968 ERR("eglCreatePixmapSurface() for %p failed", wl_buf); 2968 WRN("eglCreatePixmapSurface() for %p failed", wl_buf);
2969 eina_hash_del(gl_context->shared->native_wl_hash, 2969 eina_hash_del(gl_context->shared->native_wl_hash,
2970 &wlid, im); 2970 &wlid, im);
2971 glsym_evas_gl_common_image_free(im); 2971 glsym_evas_gl_common_image_free(im);
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 024e794..58eb54a 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1317,7 +1317,7 @@ eng_image_native_set(void *engine, void *image, void *native)
1317 else 1317 else
1318 ERR("Try eglCreateImage on EGL with no support"); 1318 ERR("Try eglCreateImage on EGL with no support");
1319 if (!n->ns_data.tbm.surface) 1319 if (!n->ns_data.tbm.surface)
1320 ERR("eglCreateImage() for %p failed", buffer); 1320 WRN("eglCreateImage() for %p failed", buffer);
1321 img->native.yinvert = 1; 1321 img->native.yinvert = 1;
1322 img->native.loose = 0; 1322 img->native.loose = 0;
1323 img->native.disp = ob->egl_disp; 1323 img->native.disp = ob->egl_disp;