From 708c5377905e1255cf726d90394ad684a27cb697 Mon Sep 17 00:00:00 2001 From: Dongyeon Kim Date: Fri, 10 Apr 2015 16:13:31 +0900 Subject: [PATCH] Evas GL: Add missing dlopen for GLX 1.x version Summary: For GLX backend, we should dlopen libGL.so* @fix Test Plan: Evas GL 1.x test cases Reviewers: cedric, jpeg Reviewed By: jpeg Subscribers: mythri, mer.kim, wonsik, cedric Differential Revision: https://phab.enlightenment.org/D2322 --- .../evas/engines/gl_common/evas_gl_api_gles1.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c index b51893915c..0d81392021 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c +++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c @@ -3840,11 +3840,22 @@ _evgl_gles1_api_init(void) if (_initialized) return EINA_TRUE; memset(&_gles1_api, 0, sizeof(_gles1_api)); + +#ifdef GL_GLES _gles1_handle = dlopen("libGLES_CM.so", RTLD_NOW); if (!_gles1_handle) _gles1_handle = dlopen("libGLES_CM.so.1", RTLD_NOW); if (!_gles1_handle) _gles1_handle = dlopen("libGLES_CM.so.1.1", RTLD_NOW); if (!_gles1_handle) _gles1_handle = dlopen("libGLESv1_CM.so", RTLD_NOW); if (!_gles1_handle) _gles1_handle = dlopen("libGLESv1_CM.so.1", RTLD_NOW); +#else + _gles1_handle = dlopen("libGL.so", RTLD_NOW); + if (!_gles1_handle) _gles1_handle = dlopen("libGL.so.4", RTLD_NOW); + if (!_gles1_handle) _gles1_handle = dlopen("libGL.so.3", RTLD_NOW); + if (!_gles1_handle) _gles1_handle = dlopen("libGL.so.2", RTLD_NOW); + if (!_gles1_handle) _gles1_handle = dlopen("libGL.so.1", RTLD_NOW); + if (!_gles1_handle) _gles1_handle = dlopen("libGL.so.0", RTLD_NOW); +#endif + if (!_gles1_handle) { WRN("OpenGL ES 1 was not found on this system. Evas GL will not support GLES 1 contexts.");