ubergames
/
lilium-voyager
mirror of https://github.com/UberGames/lilium-voyager.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into game/eliteforce

This commit is contained in:
Zack Middleton 2018-06-01 16:56:24 -05:00
parent 939020fb0e ce1d5406d5
commit 0b0e10fba3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/sdl/sdl_glimp.c
View File

@ -266,7 +266,7 @@ static qboolean GLimp_GetProcAddresses( void ) {
sscanf( version, "%d.%d", &qglMajorVersion, &qglMinorVersion ); sscanf( version, "%d.%d", &qglMajorVersion, &qglMinorVersion );
} }
if ( QGL_VERSION_ATLEAST( 1, 1 ) ) { if ( QGL_VERSION_ATLEAST( 1, 2 ) ) {
QGL_1_1_PROCS; QGL_1_1_PROCS;
QGL_DESKTOP_1_1_PROCS; QGL_DESKTOP_1_1_PROCS;
} else if ( qglesMajorVersion == 1 && qglesMinorVersion >= 1 ) { } else if ( qglesMajorVersion == 1 && qglesMinorVersion >= 1 ) {
@ -641,6 +641,8 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
if( ( SDL_glContext = SDL_GL_CreateContext( SDL_window ) ) == NULL ) if( ( SDL_glContext = SDL_GL_CreateContext( SDL_window ) ) == NULL )
{ {
ri.Printf( PRINT_DEVELOPER, "SDL_GL_CreateContext failed: %s\n", SDL_GetError( ) ); ri.Printf( PRINT_DEVELOPER, "SDL_GL_CreateContext failed: %s\n", SDL_GetError( ) );
SDL_DestroyWindow( SDL_window );
SDL_window = NULL;
continue; continue;
} }