summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-07-20 13:25:16 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-07-20 13:31:34 +0900
commitd6c95d1e4b5fd5adbef7e193cc5f6851749ef19f (patch)
tree73e33e2487aafff504974ef40ab22a5ba6ba6fd6 /src/modules/evas/engines
parent0c78783045e1b6b26133350865a910f97031ad02 (diff)
evas gl: Rename secsym_ to eglsym_
eglDestroyImage has nothing to do with SEC... This is a cosmetic change.
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c16
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index c5df435ca3..75acb7e221 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -774,7 +774,7 @@ extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsiz
774#ifdef GL_GLES 774#ifdef GL_GLES
775EAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); 775EAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
776EAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im); 776EAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im);
777extern unsigned int (*secsym_eglDestroyImage) (void *a, void *b); 777extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b);
778extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b); 778extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
779extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d); 779extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d);
780extern unsigned int (*secsym_eglUnmapImageSEC) (void *a, void *b, int c); 780extern 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
935# define glsym_glUnmapBuffer(...) GL_ERROR_TRACE_RET(unsigned int, glsym_glUnmapBuffer, #__VA_ARGS__, __VA_ARGS__) 935# define glsym_glUnmapBuffer(...) GL_ERROR_TRACE_RET(unsigned int, glsym_glUnmapBuffer, #__VA_ARGS__, __VA_ARGS__)
936# define eglsym_eglCreateImage(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImage, #__VA_ARGS__, __VA_ARGS__) 936# define eglsym_eglCreateImage(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImage, #__VA_ARGS__, __VA_ARGS__)
937# define eglsym_eglCreateImageKHR(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImageKHR, #__VA_ARGS__, __VA_ARGS__) 937# define eglsym_eglCreateImageKHR(...) GL_ERROR_TRACE_RET(void *, eglsym_eglCreateImageKHR, #__VA_ARGS__, __VA_ARGS__)
938# define secsym_eglDestroyImage(...) GL_ERROR_TRACE_RET(unsigned int, secsym_eglDestroyImage, #__VA_ARGS__, __VA_ARGS__) 938# define eglsym_eglDestroyImage(...) GL_ERROR_TRACE_RET(unsigned int, eglsym_eglDestroyImage, #__VA_ARGS__, __VA_ARGS__)
939# define secsym_glEGLImageTargetTexture2DOES(...) GL_ERROR_TRACE(secsym_glEGLImageTargetTexture2DOES, #__VA_ARGS__, __VA_ARGS__) 939# define secsym_glEGLImageTargetTexture2DOES(...) GL_ERROR_TRACE(secsym_glEGLImageTargetTexture2DOES, #__VA_ARGS__, __VA_ARGS__)
940# define secsym_eglMapImageSEC(...) GL_ERROR_TRACE_RET(void *, secsym_eglMapImageSEC, #__VA_ARGS__, __VA_ARGS__) 940# define secsym_eglMapImageSEC(...) GL_ERROR_TRACE_RET(void *, secsym_eglMapImageSEC, #__VA_ARGS__, __VA_ARGS__)
941# define secsym_eglUnmapImageSEC(...) GL_ERROR_TRACE_RET(unsigned int, secsym_eglUnmapImageSEC, #__VA_ARGS__, __VA_ARGS__) 941# define secsym_eglUnmapImageSEC(...) GL_ERROR_TRACE_RET(unsigned int, secsym_eglUnmapImageSEC, #__VA_ARGS__, __VA_ARGS__)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 4ba070a574..317363e3b8 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -49,7 +49,7 @@ typedef int (*secsym_func_int) ();
49typedef unsigned int (*secsym_func_uint) (); 49typedef unsigned int (*secsym_func_uint) ();
50typedef void *(*secsym_func_void_ptr) (); 50typedef void *(*secsym_func_void_ptr) ();
51 51
52unsigned int (*secsym_eglDestroyImage) (void *a, void *b) = NULL; 52unsigned int (*eglsym_eglDestroyImage) (void *a, void *b) = NULL;
53void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL; 53void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
54void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d) = NULL; 54void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d) = NULL;
55unsigned int (*secsym_eglUnmapImageSEC) (void *a, void *b, int c) = NULL; 55unsigned 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
152EAPI int 152EAPI int
153evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im) 153evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
154{ 154{
155 if (secsym_eglDestroyImage) 155 if (eglsym_eglDestroyImage)
156 return secsym_eglDestroyImage(dpy, im); 156 return eglsym_eglDestroyImage(dpy, im);
157 return EGL_FALSE; 157 return EGL_FALSE;
158} 158}
159 159
@@ -335,16 +335,16 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
335 if ((vmaj > 1) || (vmaj == 1 && vmin >= 5)) 335 if ((vmaj > 1) || (vmaj == 1 && vmin >= 5))
336 { 336 {
337 eglsym_eglCreateImage = dlsym(RTLD_DEFAULT, "eglCreateImage"); 337 eglsym_eglCreateImage = dlsym(RTLD_DEFAULT, "eglCreateImage");
338 secsym_eglDestroyImage = dlsym(RTLD_DEFAULT, "eglDestroyImage"); 338 eglsym_eglDestroyImage = dlsym(RTLD_DEFAULT, "eglDestroyImage");
339 } 339 }
340 340
341 // For EGL <= 1.4 only the KHR extension exists: "EGL_KHR_image_base" 341 // For EGL <= 1.4 only the KHR extension exists: "EGL_KHR_image_base"
342 if (!eglsym_eglCreateImage || !secsym_eglDestroyImage) 342 if (!eglsym_eglCreateImage || !eglsym_eglDestroyImage)
343 { 343 {
344 eglsym_eglCreateImage = NULL; 344 eglsym_eglCreateImage = NULL;
345 secsym_eglDestroyImage = NULL; 345 eglsym_eglDestroyImage = NULL;
346 FINDSYMN(eglsym_eglCreateImageKHR, "eglCreateImageKHR", "EGL_KHR_image_base", secsym_func_void_ptr); 346 FINDSYMN(eglsym_eglCreateImageKHR, "eglCreateImageKHR", "EGL_KHR_image_base", secsym_func_void_ptr);
347 FINDSYMN(secsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base", secsym_func_uint); 347 FINDSYMN(eglsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base", secsym_func_uint);
348 } 348 }
349 } 349 }
350 350
@@ -933,7 +933,7 @@ evas_gl_common_context_new(void)
933 { 933 {
934 // test for all needed symbols - be "conservative" and 934 // test for all needed symbols - be "conservative" and
935 // need all of it 935 // need all of it
936 if ((secsym_eglDestroyImage) && 936 if ((eglsym_eglDestroyImage) &&
937 (secsym_glEGLImageTargetTexture2DOES) && 937 (secsym_glEGLImageTargetTexture2DOES) &&
938 (secsym_eglMapImageSEC) && 938 (secsym_eglMapImageSEC) &&
939 (secsym_eglUnmapImageSEC) && 939 (secsym_eglUnmapImageSEC) &&
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 77c55f593b..5d99e07be0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -941,7 +941,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
941error: 941error:
942 if (pt->dyn.img) 942 if (pt->dyn.img)
943 { 943 {
944 secsym_eglDestroyImage(egldisplay, pt->dyn.img); 944 eglsym_eglDestroyImage(egldisplay, pt->dyn.img);
945 pt->dyn.img = NULL; 945 pt->dyn.img = NULL;
946 } 946 }
947 glBindTexture(pt->dyn.target, 0); 947 glBindTexture(pt->dyn.target, 0);
@@ -1005,7 +1005,7 @@ evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
1005 } 1005 }
1006 if (pt->dyn.buffer) 1006 if (pt->dyn.buffer)
1007 secsym_tbm_surface_destroy(pt->dyn.buffer); 1007 secsym_tbm_surface_destroy(pt->dyn.buffer);
1008 secsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img); 1008 eglsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
1009 pt->dyn.img = NULL; 1009 pt->dyn.img = NULL;
1010 pt->dyn.buffer = NULL; 1010 pt->dyn.buffer = NULL;
1011 pt->dyn.data = NULL; 1011 pt->dyn.data = NULL;