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

remove warning - bug ready to happen with fastpath. didnt pass 

sharedlist or direct down.



SVN revision: 65895
This commit is contained in:
Carsten Haitzler 2011-12-05 09:18:05 +00:00
parent 9f5a8809c7
commit e477ff0629
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/evas/src/modules/engines/gl_common/evas_gl_core.c
View File

@ -1659,7 +1659,7 @@ fpgl_glXCreateContext(Display* dpy, XVisualInfo* vis, GLXContext shareList, Bool
{ {
global_dpy = dpy; global_dpy = dpy;
// Create a global context if it hasn't been created yet // Create a global context if it hasn't been created yet
global_ctx = _sym_glXCreateContext(dpy, vis, NULL, 1); global_ctx = _sym_glXCreateContext(dpy, vis, shareList, direct);
if (!global_ctx) if (!global_ctx)
{ {
ERR("Failed creating a glX global context for FastPath.\n"); ERR("Failed creating a glX global context for FastPath.\n");
@ -4757,7 +4757,10 @@ gl_lib_init(void)
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
//------------------------------------------------// //------------------------------------------------//
// Open EGL Library as EGL is separate // Open EGL Library as EGL is separate
egl_lib_handle = dlopen("libEGL.so.1", RTLD_NOW|RTLD_GLOBAL); // FIXME: RTLD_GLOBAL shouldnt really be needed technically.
egl_lib_handle = dlopen("libEGL.so.2", RTLD_NOW|RTLD_GLOBAL);
if (!egl_lib_handle)
egl_lib_handle = dlopen("libEGL.so.1", RTLD_NOW|RTLD_GLOBAL);
if (!egl_lib_handle) if (!egl_lib_handle)
egl_lib_handle = dlopen("libEGL.so", RTLD_NOW|RTLD_GLOBAL); egl_lib_handle = dlopen("libEGL.so", RTLD_NOW|RTLD_GLOBAL);
if (!egl_lib_handle) if (!egl_lib_handle)
@ -4767,7 +4770,9 @@ gl_lib_init(void)
} }
// use gl_lib handle for GL symbols // use gl_lib handle for GL symbols
gl_lib_handle = dlopen("libGLESv2.so.1", RTLD_NOW); gl_lib_handle = dlopen("libGLESv2.so.2", RTLD_NOW);
if (!gl_lib_handle)
gl_lib_handle = dlopen("libGLESv2.so.1", RTLD_NOW);
if (!gl_lib_handle) if (!gl_lib_handle)
gl_lib_handle = dlopen("libGLESv2.so", RTLD_NOW); gl_lib_handle = dlopen("libGLESv2.so", RTLD_NOW);
if (!gl_lib_handle) if (!gl_lib_handle)
@ -4782,9 +4787,15 @@ gl_lib_init(void)
// use gl_lib handle for both GLX and GL symbols // use gl_lib handle for both GLX and GL symbols
//gl_lib_handle = dlopen("/usr/lib/libGL.so", RTLD_NOW); //gl_lib_handle = dlopen("/usr/lib/libGL.so", RTLD_NOW);
gl_lib_handle = dlopen("libGL.so.1", RTLD_NOW); gl_lib_handle = dlopen("libGL.so.4", RTLD_NOW);
if (!gl_lib_handle) if (!gl_lib_handle)
gl_lib_handle = dlopen("libGL.so", RTLD_NOW); gl_lib_handle = dlopen("libGL.so.3", RTLD_NOW);
if (!gl_lib_handle)
gl_lib_handle = dlopen("libGL.so.2", RTLD_NOW);
if (!gl_lib_handle)
gl_lib_handle = dlopen("libGL.so.1", RTLD_NOW);
if (!gl_lib_handle)
gl_lib_handle = dlopen("libGL.so", RTLD_NOW);
if (!gl_lib_handle) if (!gl_lib_handle)
{ {
ERR("%s\n", dlerror()); ERR("%s\n", dlerror());