derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=acb0ee2a9dc37df18444a684e90cf28117eeb9a1
commit acb0ee2a9dc37df18444a684e90cf28117eeb9a1
Author: Derek Foreman <der...@osg.samsung.com>
Date: Tue Dec 20 09:34:07 2016 -0600
evas engines: Use EGLImageKHR instead of EGLImage
If someone's trying to build efl git with 2.5 year old EGL headers they get
a break on missing EGLImage...
We should probably consider keeping an up to date copy of the EGL headers
in efl. There may be someone out there with even older headers.
---
src/modules/evas/engines/gl_drm/evas_engine.c | 2 +-
src/modules/evas/engines/gl_x11/evas_engine.c | 2 +-
src/modules/evas/engines/wayland_egl/evas_engine.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 7132804..5fab775 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -72,7 +72,7 @@ glsym_func_void_ptr glsym_evas_gl_common_current_context_get
= NULL;
/* dynamic loaded local egl function pointers */
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
-EGLImage (*glsym_evas_gl_common_eglCreateImage) (EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
+EGLImageKHR (*glsym_evas_gl_common_eglCreateImage) (EGLDisplay a, EGLContext
b, EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
void (*glsym_eglDestroyImage)(EGLDisplay a, void *b) = NULL;
void (*glsym_glEGLImageTargetTexture2DOES)(int a, void *b) = NULL;
unsigned int (*glsym_eglSwapBuffersWithDamage)(EGLDisplay a, void *b, const
EGLint *d, EGLint c) = NULL;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index aecd0c7..9d6150a 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -84,7 +84,7 @@ typedef intptr_t EGLAttribKHR;
#endif
_eng_fn (*glsym_eglGetProcAddress) (const char *a) = NULL;
-EGLImage (*glsym_evas_gl_common_eglCreateImage)(EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
+EGLImageKHR (*glsym_evas_gl_common_eglCreateImage)(EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
void (*glsym_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
void (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const
EGLint *d, EGLint c) = NULL;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index d416760..eaff2d0 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -67,7 +67,7 @@ Evas_GL_Preload_Render_Call
glsym_evas_gl_preload_render_unlock = NULL;
Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_relax = NULL;
_eng_fn (*glsym_eglGetProcAddress) (const char *a) = NULL;
-EGLImage (*glsym_evas_gl_common_eglCreateImage)(EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
+EGLImageKHR (*glsym_evas_gl_common_eglCreateImage)(EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
void (*glsym_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
void (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const
EGLint *d, EGLint c) = NULL;
--
