kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas gl: Rename secsym_ to eglsym_ 

eglDestroyImage has nothing to do with SEC...
This is a cosmetic change.
This commit is contained in:
Jean-Philippe Andre 2017-07-20 13:25:16 +09:00
parent 0c78783045
commit d6c95d1e4b
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/evas/engines/gl_common/evas_gl_common.h
View File

@ -774,7 +774,7 @@ extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsiz
#ifdef GL_GLES
EAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
EAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im);
extern unsigned int (*secsym_eglDestroyImage) (void *a, void *b);
extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b);
extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d);
extern unsigned int (*secsym_eglUnmapImageSEC) (void *a, void *b, int c);
@ -935,7 +935,7 @@ __evas_gl_errdyn(int err, const char *file, const char *func, int line, const ch
# define glsym_glUnmapBuffer(...) GL_ERROR_TRACE_RET(unsigned int, glsym_glUnmapBuffer, #__VA_ARGS__, __VA_ARGS__)
# define eglsym_eglCreateImage(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImage, #__VA_ARGS__, __VA_ARGS__)
# define eglsym_eglCreateImageKHR(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImageKHR, #__VA_ARGS__, __VA_ARGS__)
# define secsym_eglDestroyImage(...) GL_ERROR_TRACE_RET(unsigned int, secsym_eglDestroyImage, #__VA_ARGS__, __VA_ARGS__)
# define eglsym_eglDestroyImage(...) GL_ERROR_TRACE_RET(unsigned int, eglsym_eglDestroyImage, #__VA_ARGS__, __VA_ARGS__)
# define secsym_glEGLImageTargetTexture2DOES(...) GL_ERROR_TRACE(secsym_glEGLImageTargetTexture2DOES, #__VA_ARGS__, __VA_ARGS__)
# define secsym_eglMapImageSEC(...) GL_ERROR_TRACE_RET(void *, secsym_eglMapImageSEC, #__VA_ARGS__, __VA_ARGS__)
# define secsym_eglUnmapImageSEC(...) GL_ERROR_TRACE_RET(unsigned int, secsym_eglUnmapImageSEC, #__VA_ARGS__, __VA_ARGS__)

16
src/modules/evas/engines/gl_common/evas_gl_context.c
View File

@ -49,7 +49,7 @@ typedef int (*secsym_func_int) ();
typedef unsigned int (*secsym_func_uint) ();
typedef void *(*secsym_func_void_ptr) ();
unsigned int (*secsym_eglDestroyImage) (void *a, void *b) = NULL;
unsigned int (*eglsym_eglDestroyImage) (void *a, void *b) = NULL;
void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d) = NULL;
unsigned int (*secsym_eglUnmapImageSEC) (void *a, void *b, int c) = NULL;
@ -152,8 +152,8 @@ evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EG
EAPI int
evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
{
if (secsym_eglDestroyImage)
return secsym_eglDestroyImage(dpy, im);
if (eglsym_eglDestroyImage)
return eglsym_eglDestroyImage(dpy, im);
return EGL_FALSE;
}
@ -335,16 +335,16 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
if ((vmaj > 1) || (vmaj == 1 && vmin >= 5))
{
eglsym_eglCreateImage = dlsym(RTLD_DEFAULT, "eglCreateImage");
secsym_eglDestroyImage = dlsym(RTLD_DEFAULT, "eglDestroyImage");
eglsym_eglDestroyImage = dlsym(RTLD_DEFAULT, "eglDestroyImage");
}
// For EGL <= 1.4 only the KHR extension exists: "EGL_KHR_image_base"
if (!eglsym_eglCreateImage || !secsym_eglDestroyImage)
if (!eglsym_eglCreateImage || !eglsym_eglDestroyImage)
{
eglsym_eglCreateImage = NULL;
secsym_eglDestroyImage = NULL;
eglsym_eglDestroyImage = NULL;
FINDSYMN(eglsym_eglCreateImageKHR, "eglCreateImageKHR", "EGL_KHR_image_base", secsym_func_void_ptr);
FINDSYMN(secsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base", secsym_func_uint);
FINDSYMN(eglsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base", secsym_func_uint);
}
}
@ -933,7 +933,7 @@ evas_gl_common_context_new(void)
{
// test for all needed symbols - be "conservative" and
// need all of it
if ((secsym_eglDestroyImage) &&
if ((eglsym_eglDestroyImage) &&
(secsym_glEGLImageTargetTexture2DOES) &&
(secsym_eglMapImageSEC) &&
(secsym_eglUnmapImageSEC) &&

4
src/modules/evas/engines/gl_common/evas_gl_texture.c
View File

@ -941,7 +941,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
error:
if (pt->dyn.img)
{
secsym_eglDestroyImage(egldisplay, pt->dyn.img);
eglsym_eglDestroyImage(egldisplay, pt->dyn.img);
pt->dyn.img = NULL;
}
glBindTexture(pt->dyn.target, 0);
@ -1005,7 +1005,7 @@ evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
}
if (pt->dyn.buffer)
secsym_tbm_surface_destroy(pt->dyn.buffer);
secsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
eglsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
pt->dyn.img = NULL;
pt->dyn.buffer = NULL;
pt->dyn.data = NULL;