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

Merge pull request #327 from davg-qqq/fix-osmesa-crash 

Fix unhandled null causing crash when using osmesa with nvidia driver
This commit is contained in:
zeromus 2020-05-03 16:52:43 -04:00 committed by GitHub
parent d556c99771 a1791a24f0
commit 1cc14031c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desmume/src/OGLRender_3_2.cpp
View File

@ -2033,8 +2033,11 @@ void OpenGLRenderer_3_2::GetExtensionSet(std::set<std::string> *oglExtensionSet)
glGetIntegerv(GL_NUM_EXTENSIONS, &extensionCount); glGetIntegerv(GL_NUM_EXTENSIONS, &extensionCount);
for (size_t i = 0; i < extensionCount; i++) for (size_t i = 0; i < extensionCount; i++)
{ {
std::string extensionName = std::string((const char *)glGetStringi(GL_EXTENSIONS, i)); const char * extensionName = (const char *)glGetStringi(GL_EXTENSIONS, i);
oglExtensionSet->insert(extensionName); if (extensionName == NULL) {
continue;
}
oglExtensionSet->insert(std::string(extensionName));
} }
} }