sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

attempt to fix crashes (reported under Linux)related to OpenGL extension queries.

Browse Source 
seems to be a known issue, combo of pthreads, dlopen and libGL cannot call dlclose !?!
Let's cross the fingers this works...
This commit is contained in:
Erwin Coumans 2006-07-06 21:21:16 +00:00
parent a156ecb7f5
commit 011749eb08
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
View File

@ -177,19 +177,30 @@ typedef void (*(*PFNBGLXGETPROCADDRESSARBPROC)(const GLubyte *procname))();
void *_getProcAddress(const GLubyte *procName) { return NULL; }
PFNBGLXGETPROCADDRESSARBPROC bglGetProcAddress;
//weird bug related to combination of pthreads,libGL and dlopen
//cannot call dlclose in such environment, causes crashes
//so try to keep a global handle to libGL
void* libGL = 0;
static void bglInitEntryPoints (void)
{
Display *dpy = glXGetCurrentDisplay();
std::vector<STR_String> Xextensions = STR_String(glXQueryExtensionsString(dpy, DefaultScreen(dpy))).Explode(' ');
if (std::find(Xextensions.begin(), Xextensions.end(), "GLX_ARB_get_proc_address") != Xextensions.end())
{
void *libGL = dlopen("libGL.so", RTLD_LAZY);
if (libGL)
if (!libGL)
{
libGL = dlopen("libGL.so", RTLD_GLOBAL);
bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
dlclose(libGL);
// dlclose(libGL);
if (!bglGetProcAddress)
bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) _getProcAddress;
// --
if( !libGL && !bglGetProcAddress)
std::cout << "Error: " << dlerror() << std::endl;
}
}
}