From 90985d228205ac0ed583c2219d5daaecd3be0f9d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 12 Jun 2014 12:47:32 +0900 Subject: [PATCH] Evas gl: Remove dlsym of glCompressedTexImage2D The function was used directly in evas_gl_texture.c It must be part of OpenGL core functions (since GLES 1.1 and OpenGL 2 I think). --- src/modules/evas/engines/gl_common/evas_gl_common.h | 9 +-------- src/modules/evas/engines/gl_common/evas_gl_context.c | 9 +-------- 2 files changed, 2 insertions(+), 16 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 917c86f..334fed5 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -859,14 +859,7 @@ extern void (*glsym_glProgramParameteri) (GLuint a, GLuint b, GLint d); extern void (*glsym_glReleaseShaderCompiler)(void); extern void *(*glsym_glMapBuffer) (GLenum a, GLenum b); extern GLboolean (*glsym_glUnmapBuffer) (GLenum a); -extern void (*glsym_glCompressedTexImage2d) (GLenum target, - GLint level, - GLenum internalformat, - GLsizei width, - GLsizei height, - GLint border, - GLsizei imageSize, - const GLvoid * data); + #ifdef GL_GLES extern void *(*secsym_eglCreateImage) (void *a, void *b, GLenum c, void *d, const int *e); extern unsigned int (*secsym_eglDestroyImage) (void *a, void *b); 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 aaabc78..5eb0657 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -30,10 +30,6 @@ GLboolean (*glsym_glUnmapBuffer) (GLenum a) = NULL; void (*glsym_glStartTiling) (GLuint a, GLuint b, GLuint c, GLuint d, GLuint e) = NULL; void (*glsym_glEndTiling) (GLuint a) = NULL; -void (*glsym_glCompressedTexImage2d) (GLenum target, GLint level, GLenum internalformat, - GLsizei width, GLsizei height, GLint border, GLsizei imageSize, - const GLvoid * data) = NULL; - #ifdef GL_GLES // just used for finding symbols :) typedef void (*_eng_fn) (void); @@ -215,8 +211,6 @@ gl_symbols(void) FINDSYM(secsym_eglGetImageAttribSEC, "eglGetImageAttribSEC", secsym_func_uint); #endif - FINDSYM(glsym_glCompressedTexImage2d, "glCompressedTexImage2D", glsym_func_void); - FINDSYM2(glsym_glCompressedTexImage2d, "glCompressedTexImage2D", glsym_func_void); } static void shader_array_flush(Evas_Engine_GL_Context *gc); @@ -629,7 +623,7 @@ evas_gl_common_context_new(void) (strstr((char *)ext, "GL_EXT_texture_format_BGRA8888"))) shared->info.bgra = 1; #endif - if (glsym_glCompressedTexImage2d && strstr((char *)ext, "OES_compressed_ETC1_RGB8_texture")) + if (strstr((char *)ext, "OES_compressed_ETC1_RGB8_texture")) shared->info.etc1 = 1; #ifdef GL_GLES // FIXME: there should be an extension name/string to check for @@ -726,7 +720,6 @@ evas_gl_common_context_new(void) #ifdef GL_GLES // Detect ECT2 support. We need both RGB and RGBA formats. - if (glsym_glCompressedTexImage2d) { GLint texFormatCnt = 0; glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &texFormatCnt); -- 2.7.4