Module: Mesa Branch: gallium-mesa-7.4 Commit: a75c94862b8682f59cd3a9c77b2aa6d171e2aff9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a75c94862b8682f59cd3a9c77b2aa6d171e2aff9
Author: Alan Hourihane <[email protected]> Date: Thu Mar 19 15:39:57 2009 +0000 egl: try harder for eglGetProcAddress() Conflicts: src/egl/drivers/glx/egl_glx.c --- src/egl/drivers/glx/egl_glx.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c index ec5b298..18ab108 100644 --- a/src/egl/drivers/glx/egl_glx.c +++ b/src/egl/drivers/glx/egl_glx.c @@ -804,15 +804,19 @@ static _EGLProc GLX_eglGetProcAddress(const char *procname) { /* This is a bit of a hack to get at the gallium/Mesa state tracker - * function st_get_proc_address(). This will probably change at - * some point. - */ - _EGLProc (*st_get_proc_addr)(const char *procname); - st_get_proc_addr = dlsym(NULL, "st_get_proc_address"); - if (st_get_proc_addr) - return st_get_proc_addr(procname); - - return (_EGLProc)glXGetProcAddress((const GLubyte *)procname); + * * function st_get_proc_address(). This will probably change at + * * some point. + * */ + _EGLProc (*get_proc_addr)(const char *procname); + get_proc_addr = dlsym(NULL, "st_get_proc_address"); + if (get_proc_addr) + return get_proc_addr(procname); + + get_proc_addr = glXGetProcAddress((const GLubyte *)procname); + if (get_proc_addr) + return get_proc_addr(procname); + + return (_EGLProc)dlsym(NULL, procname); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
