Commit 66999cf6 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Set an error message when SDL_GL_SetAttribute() fails because we can't support

 the attribute on X11.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402578
parent bf1bbf37
......@@ -338,7 +338,8 @@ int X11_GL_MakeCurrent(_THIS)
/* Get attribute data from glX. */
int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value)
{
int retval;
int retval = -1;
int unsupported = 0;
int glx_attrib = None;
switch( attrib ) {
......@@ -398,7 +399,7 @@ int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value)
}
return retval;
} else {
return(-1);
unsupported = 1;
}
break;
case SDL_GL_SWAP_CONTROL:
......@@ -406,15 +407,19 @@ int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value)
*value = this->gl_data->glXGetSwapIntervalMESA();
return(0);
} else {
return(-1);
unsupported = 1;
}
break;
default:
return(-1);
unsupported = 1;
break;
}
retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value);
if (unsupported) {
SDL_SetError("OpenGL attribute is unsupported on this system");
} else {
retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value);
}
return retval;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment