summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-06-14 15:32:39 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-06-14 15:32:39 +0900
commit7a9f40b5ee5107beb06d9fa347c9e7d0a321abb6 (patch)
tree6ecbfb8d6efbe92dfcf39ac6f58e01ebf067e51e
parentc1190d45398f61bb14baa3315b4e9eb6c7c77b98 (diff)
downloadefl-7a9f40b5ee5107beb06d9fa347c9e7d0a321abb6.tar.gz
evas: wayland egl - mirror changes to gl_x11 for swapbufferswithdamage
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index edaeac62bb..6c5e3e1e72 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -131,7 +131,7 @@ void (*glsym_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
void (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
void *(*glsym_eglMapImageSEC) (void *a, void *b, int c, int d) = NULL;
unsigned int (*glsym_eglUnmapImageSEC) (void *a, void *b, int c) = NULL;
-unsigned int (*glsym_eglSwapBuffersRegion) (EGLDisplay a, EGLSurface *b, EGLint c, const EGLint *d) = NULL;
+void (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const EGLint *d, EGLint c) = NULL;
#endif
@@ -180,11 +180,10 @@ evgl_symbols(void)
FINDSYM(glsym_eglMapImageSEC, "eglMapImageSEC", glsym_func_void_ptr);
FINDSYM(glsym_eglUnmapImageSEC, "eglUnmapImageSEC", glsym_func_uint);
- FINDSYM(glsym_eglSwapBuffersRegion,
- "eglSwapBuffersRegionSEC", glsym_func_uint);
- FINDSYM(glsym_eglSwapBuffersRegion,
- "eglSwapBuffersRegion", glsym_func_uint);
-
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT", glsym_func_void_ptr);
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL", glsym_func_void_ptr);
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage", glsym_func_void_ptr);
+
done = EINA_TRUE;
}
@@ -201,11 +200,14 @@ evgl_extn_veto(Render_Engine *re)
if (getenv("EVAS_GL_INFO")) printf("EGL EXTENSION:\n%s\n", str);
if (!strstr(str, "EGL_EXT_buffer_age"))
extn_have_buffer_age = EINA_FALSE;
+ if (!strstr(str, "swap_buffers_with_damage"))
+ glsym_eglSwapBuffersWithDamage = NULL;
}
else
{
if (getenv("EVAS_GL_INFO")) printf("NO EGL EXTENSIONS !!\n");
extn_have_buffer_age = EINA_FALSE;
+ glsym_eglSwapBuffersWithDamage = NULL;
}
}
@@ -1188,7 +1190,7 @@ eng_output_flush(void *data, Evas_Render_Mode render_mode)
if (re->info->callback.pre_swap)
re->info->callback.pre_swap(re->info->callback.data, re->evas);
- if ((glsym_eglSwapBuffersRegion) && (re->mode != MODE_FULL))
+ if ((glsym_eglSwapBuffersWithDamage) && (re->mode != MODE_FULL))
{
EGLint num = 0, *rects = NULL, i = 0;
Tilebuf_Rect *r;
@@ -1239,8 +1241,9 @@ eng_output_flush(void *data, Evas_Render_Mode render_mode)
}
i += 4;
}
- glsym_eglSwapBuffersRegion(re->win->egl_disp,
- re->win->egl_surface[0], num, rects);
+ glsym_eglSwapBuffersWithDamage(re->win->egl_disp,
+ re->win->egl_surface[0],
+ rects, num);
}
}
else