From 58b8cfa0b3fb926ffc6c699967199ef18ed0fda7 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 15 Sep 2013 23:54:52 +0100 Subject: [PATCH] Various fixes from Fuma --- code/sdl/sdl_glimp.c | 12 +++--------- code/sys/sys_main.c | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index ce85741c..281d8ec9 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -46,7 +46,7 @@ typedef enum } rserr_t; SDL_Window *SDL_window = NULL; -static SDL_GLContext *SDL_glContext = NULL; +static SDL_GLContext SDL_glContext = NULL; cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained cvar_t *r_allowResize; // make window resizable @@ -102,8 +102,8 @@ GLimp_CompareModes static int GLimp_CompareModes( const void *a, const void *b ) { const float ASPECT_EPSILON = 0.001f; - SDL_Rect *modeA = (SDL_Rect *)&a; - SDL_Rect *modeB = (SDL_Rect *)&b; + SDL_Rect *modeA = (SDL_Rect *)a; + SDL_Rect *modeB = (SDL_Rect *)b; float aspectA = (float)modeA->w / (float)modeA->h; float aspectB = (float)modeB->w / (float)modeB->h; int areaA = modeA->w * modeA->h; @@ -448,12 +448,6 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder) continue; } - if( SDL_GL_MakeCurrent( SDL_window, SDL_glContext ) < 0 ) - { - ri.Printf( PRINT_DEVELOPER, "SDL_GL_MakeCurrent failed: %s\n", SDL_GetError( ) ); - continue; - } - SDL_GL_SetSwapInterval( r_swapInterval->integer ); glConfig.colorBits = testColorBits; diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c index 1455ff69..43d9bd94 100644 --- a/code/sys/sys_main.c +++ b/code/sys/sys_main.c @@ -590,7 +590,7 @@ int main( int argc, char **argv ) // Run time SDL_version ver; - SDL_VERSION( &ver ); + SDL_GetVersion( &ver ); #define MINSDL_VERSION \ XSTRING(MINSDL_MAJOR) "." \