From 01bc515f966f4d691e8d21fa6d04456fd56f7d13 Mon Sep 17 00:00:00 2001 From: raster Date: Mon, 5 Dec 2011 09:05:04 +0000 Subject: [PATCH] fix gles/egl bugs/issues in sungwoo's new patch git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@65894 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_core.c b/src/modules/engines/gl_common/evas_gl_core.c index 8ae7df5..ed94b43 100644 --- a/src/modules/engines/gl_common/evas_gl_core.c +++ b/src/modules/engines/gl_common/evas_gl_core.c @@ -1230,10 +1230,10 @@ evgl_eglQueryString(EGLDisplay dpy, EGLint name) return _sym_eglQueryString(dpy, name); } -static void -evgl_eglCreateImage (void *a, void *b, GLenum c, void *d, const int *e) +static void * +evgl_eglCreateImage(void *a, void *b, GLenum c, void *d, const int *e) { - _sym_eglCreateImage(a, b, c, d, e); + return _sym_eglCreateImage(a, b, c, d, e); } static unsigned int @@ -4063,7 +4063,7 @@ fpgl_glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean norma current_ctx->vertex_array[indx].type = type; current_ctx->vertex_array[indx].normalized = normalized; current_ctx->vertex_array[indx].stride = stride; - current_ctx->vertex_array[indx].pointer = ptr; + current_ctx->vertex_array[indx].pointer = (void *)ptr; } static void @@ -5509,7 +5509,7 @@ free_gl() if (global_ctx) { ERR("Destroying global context...\n"); - _sym_eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + _sym_eglMakeCurrent(global_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); _sym_eglDestroyContext(global_dpy, global_ctx); } if (egl_lib_handle) dlclose(egl_lib_handle); -- 2.7.4