From b9049925f3ba86f1eb90427861d703c5dd44b6b3 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 27 Feb 2019 15:49:19 +0000 Subject: [PATCH] evas gl - swap with damage - look for KHR extn string too as per shortlog - look for KHR in addition to EXT for swap with damage region extn detection. --- src/modules/evas/engines/eglfs/evas_engine.c | 3 ++- src/modules/evas/engines/gl_drm/evas_engine.c | 3 ++- src/modules/evas/engines/gl_x11/evas_engine.c | 3 ++- src/modules/evas/engines/wayland_egl/evas_engine.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c index 0574127a79..84d043b6cd 100644 --- a/src/modules/evas/engines/eglfs/evas_engine.c +++ b/src/modules/evas/engines/eglfs/evas_engine.c @@ -233,7 +233,8 @@ gl_extn_veto(Render_Engine *re) glsym_eglSwapBuffersWithDamage = NULL; } if (!strstr(str, "EGL_EXT_buffer_age")) _extn_have_buffer_age = 0; - if (!strstr(str, "EGL_EXT_swap_buffers_with_damage")) + if ((!strstr(str, "EGL_EXT_swap_buffers_with_damage")) && + (!strstr(str, "EGL_KHR_swap_buffers_with_damage"))) glsym_eglSwapBuffersWithDamage = NULL; } else diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index 6333aaf10f..4f168df7f0 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -269,7 +269,8 @@ gl_extn_veto(Render_Engine *re) if (!_ckext(str, "EGL_KHR_partial_update")) glsym_eglSetDamageRegionKHR = NULL; - if (!_ckext(str, "EGL_EXT_swap_buffers_with_damage")) + if ((!_ckext(str, "EGL_EXT_swap_buffers_with_damage")) && + (!_ckext(str, "EGL_KHR_swap_buffers_with_damage"))) glsym_eglSwapBuffersWithDamage = NULL; if (_ckext(str, "EGL_EXT_image_dma_buf_import")) dmabuf_present = EINA_TRUE; diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 82e2517ca0..1d63eaace6 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -1476,7 +1476,8 @@ gl_extn_veto(Render_Engine *re) ) extn_have_y_inverted = 0; } - if (!strstr(str, "EGL_EXT_swap_buffers_with_damage")) + if ((!strstr(str, "EGL_EXT_swap_buffers_with_damage")) && + (!strstr(str, "EGL_KHR_swap_buffers_with_damage"))) { glsym_eglSwapBuffersWithDamage = NULL; } diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 9e8b6ea401..024e794ac4 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -223,7 +223,8 @@ gl_extn_veto(Render_Engine *re) ) extn_have_y_inverted = EINA_FALSE; } - if (!strstr(str, "EGL_EXT_swap_buffers_with_damage")) + if ((!strstr(str, "EGL_EXT_swap_buffers_with_damage")) && + (!strstr(str, "EGL_KHR_swap_buffers_with_damage"))) { glsym_eglSwapBuffersWithDamage = NULL; }