From 77de5019b9f3a0bededa6893c1a2b0c975d26a5b Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 28 May 2018 17:07:38 -0500 Subject: [PATCH 1/2] Don't create multiple windows when GL context creation fails --- code/sdl/sdl_glimp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index eeaf6f52..e8e50b80 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -641,6 +641,8 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool if( ( SDL_glContext = SDL_GL_CreateContext( SDL_window ) ) == NULL ) { ri.Printf( PRINT_DEVELOPER, "SDL_GL_CreateContext failed: %s\n", SDL_GetError( ) ); + SDL_DestroyWindow( SDL_window ); + SDL_window = NULL; continue; } From ce1d5406d5633d505efed2f0c57e859b51ec326d Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 28 May 2018 17:20:27 -0500 Subject: [PATCH 2/2] Require OpenGL 1.2 for GL_CLAMP_TO_EDGE --- code/sdl/sdl_glimp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index e8e50b80..debf80e9 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -266,7 +266,7 @@ static qboolean GLimp_GetProcAddresses( void ) { sscanf( version, "%d.%d", &qglMajorVersion, &qglMinorVersion ); } - if ( QGL_VERSION_ATLEAST( 1, 1 ) ) { + if ( QGL_VERSION_ATLEAST( 1, 2 ) ) { QGL_1_1_PROCS; QGL_DESKTOP_1_1_PROCS; } else if ( qglesMajorVersion == 1 && qglesMinorVersion >= 1 ) {