piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Remove AGL GetProcAddress. Change dlsym to using RTLD_NEXT. Enable dlsym fallback for OS X

Browse Source
This commit is contained in:
Ryan Houdek
2014-01-06 22:16:03 -06:00
committed by degasus
parent ca96274936
commit 34c9a33807
3 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -773,7 +773,6 @@ PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;
namespace GLExtensions
{
// Private members and functions
void *_dlsym;
bool _isES3;
bool _isES;
u32 _GLVersion;
@ -846,10 +845,9 @@ namespace GLExtensions
*func = GLInterface->GetProcAddress(name);
if (*func == NULL)
{
#if defined(__linux__)
#if defined(__linux__) || defined(__APPLE__)
// Give it a second try with dlsym
if (_dlsym) // Just in case dlopen fails
*func = dlsym(_dlsym, name.c_str());
*func = dlsym(RTLD_NEXT, name.c_str());
#endif
if (*func == NULL && _isES)
*func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on
@ -869,9 +867,6 @@ namespace GLExtensions
bool Init()
{
bool success = true;
#if defined(__linux__)
_dlsym = dlopen(NULL, RTLD_LAZY);
#endif
_isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3;
_isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2;
@ -913,9 +908,6 @@ namespace GLExtensions
if (success && !init_khr_debug()) success = false;
if (success && !init_arb_buffer_storage()) success = false;
#if defined(__linux__)
dlclose(_dlsym);
#endif
return success;
}