thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Handle cases where glGetString returns a nullptr

Browse source
This commit is contained in:
Le Philousophe 2023-03-11 17:08:01 +01:00
parent 7a328014d9
commit 4b92af9feb
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
graphics/opengl/context.cpp
View file

@ -103,7 +103,10 @@ void Context::initialize(ContextType contextType) {
const char *verString = (const char *)glGetString(GL_VERSION);
if (type == kContextGL) {
if (!verString) {
majorVersion = minorVersion = 0;
warning("Could not parse fetch GL_VERSION: %d", glGetError());
} else if (type == kContextGL) {
// OpenGL version number is either of the form major.minor or major.minor.release,
// where the numbers all have one or more digits
if (sscanf(verString, "%d.%d", &majorVersion, &minorVersion) != 2) {
@ -140,6 +143,9 @@ void Context::initialize(ContextType contextType) {
glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&maxTextureSize);
const char *extString = (const char *)glGetString(GL_EXTENSIONS);
if (!extString) {
extString = "";
}
bool ARBShaderObjects = false;
bool ARBShadingLanguage100 = false;