ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Don't fail out loading funciton pointers in both ES2 and ES3 modes.

This commit is contained in:
Ryan Houdek 2013-12-31 22:59:01 -06:00 committed by degasus
parent fc1f8291d6
commit cfb8b43b4a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,6 +437,7 @@ namespace GLExtensions
// Private members and functions // Private members and functions
void *_dlsym; void *_dlsym;
bool _isES3; bool _isES3;
bool _isES;
u32 _GLVersion; u32 _GLVersion;
std::unordered_map<std::string, bool> _extensionlist; std::unordered_map<std::string, bool> _extensionlist;
// Forward declared init functions // Forward declared init functions
@ -511,7 +512,7 @@ namespace GLExtensions
if (_dlsym) // Just in case dlopen fails if (_dlsym) // Just in case dlopen fails
*func = dlsym(_dlsym, name.c_str()); *func = dlsym(_dlsym, name.c_str());
#endif #endif
if (*func == NULL && _isES3) if (*func == NULL && _isES)
*func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on *func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on
if (*func == NULL) if (*func == NULL)
ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str()); ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str());
@ -533,6 +534,7 @@ namespace GLExtensions
_dlsym = dlopen(NULL, RTLD_LAZY); _dlsym = dlopen(NULL, RTLD_LAZY);
#endif #endif
_isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3; _isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3;
_isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2;
// Grab glGetStringi immediately // Grab glGetStringi immediately
// We need it to grab the extension list // We need it to grab the extension list