summaryrefslogtreecommitdiff
path: root/src/sdl
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2016-04-09 17:57:28 +0100
committerTim Angus <tim@ngus.net>2016-04-09 17:57:28 +0100
commitf45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch)
tree152d2a428b078f7a89756ea9e156695fc69f1686 /src/sdl
parent7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff)
parent87abdd914988724e164ffb16380ad26be8420b84 (diff)
Merge branch 'master' into gpp
Diffstat (limited to 'src/sdl')
-rw-r--r--src/sdl/sdl_gamma.c5
-rw-r--r--src/sdl/sdl_glimp.c42
-rw-r--r--src/sdl/sdl_input.c10
-rw-r--r--src/sdl/sdl_snd.c2
4 files changed, 43 insertions, 16 deletions
diff --git a/src/sdl/sdl_gamma.c b/src/sdl/sdl_gamma.c
index 0029db18..7e030683 100644
--- a/src/sdl/sdl_gamma.c
+++ b/src/sdl/sdl_gamma.c
@@ -89,6 +89,9 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
}
}
- SDL_SetWindowGammaRamp(SDL_window, table[0], table[1], table[2]);
+ if (SDL_SetWindowGammaRamp(SDL_window, table[0], table[1], table[2]) < 0)
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_SetWindowGammaRamp() failed: %s\n", SDL_GetError() );
+ }
}
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 51b448a2..fed3fc5b 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -135,19 +135,32 @@ static void GLimp_DetectAvailableModes(void)
{
int i, j;
char buf[ MAX_STRING_CHARS ] = { 0 };
- SDL_Rect modes[ 128 ];
+ int numSDLModes;
+ SDL_Rect *modes;
int numModes = 0;
- int display = SDL_GetWindowDisplayIndex( SDL_window );
SDL_DisplayMode windowMode;
+ int display = SDL_GetWindowDisplayIndex( SDL_window );
+ if( display < 0 )
+ {
+ ri.Printf( PRINT_WARNING, "Couldn't get window display index, no resolutions detected: %s\n", SDL_GetError() );
+ return;
+ }
+ numSDLModes = SDL_GetNumDisplayModes( display );
- if( SDL_GetWindowDisplayMode( SDL_window, &windowMode ) < 0 )
+ if( SDL_GetWindowDisplayMode( SDL_window, &windowMode ) < 0 || numSDLModes <= 0 )
{
- ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected\n" );
+ ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected: %s\n", SDL_GetError() );
return;
}
- for( i = 0; i < SDL_GetNumDisplayModes( display ); i++ )
+ modes = SDL_calloc( (size_t)numSDLModes, sizeof( SDL_Rect ) );
+ if ( !modes )
+ {
+ ri.Error( ERR_FATAL, "Out of memory" );
+ }
+
+ for( i = 0; i < numSDLModes; i++ )
{
SDL_DisplayMode mode;
@@ -157,6 +170,7 @@ static void GLimp_DetectAvailableModes(void)
if( !mode.w || !mode.h )
{
ri.Printf( PRINT_ALL, "Display supports any resolution\n" );
+ SDL_free( modes );
return;
}
@@ -198,6 +212,7 @@ static void GLimp_DetectAvailableModes(void)
ri.Printf( PRINT_ALL, "Available modes: '%s'\n", buf );
ri.Cvar_Set( "r_availableModes", buf );
}
+ SDL_free( modes );
}
#define R_FAILSAFE_WIDTH 640
@@ -243,9 +258,15 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
// If a window exists, note its display index
if( SDL_window != NULL )
+ {
display = SDL_GetWindowDisplayIndex( SDL_window );
+ if( display < 0 )
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_GetWindowDisplayIndex() failed: %s\n", SDL_GetError() );
+ }
+ }
- if( SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
+ if( display >= 0 && SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
{
glConfig.displayAspect = (float)desktopMode.w / (float)desktopMode.h;
@@ -445,7 +466,7 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
#endif
if( ( SDL_window = SDL_CreateWindow( CLIENT_WINDOW_TITLE, x, y,
- glConfig.vidWidth, glConfig.vidHeight, flags ) ) == 0 )
+ glConfig.vidWidth, glConfig.vidHeight, flags ) ) == NULL )
{
ri.Printf( PRINT_DEVELOPER, "SDL_CreateWindow failed: %s\n", SDL_GetError( ) );
continue;
@@ -486,7 +507,10 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
qglClear( GL_COLOR_BUFFER_BIT );
SDL_GL_SwapWindow( SDL_window );
- SDL_GL_SetSwapInterval( r_swapInterval->integer );
+ if( SDL_GL_SetSwapInterval( r_swapInterval->integer ) == -1 )
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_GL_SetSwapInterval failed: %s\n", SDL_GetError( ) );
+ }
glConfig.colorBits = testColorBits;
glConfig.depthBits = testDepthBits;
@@ -526,7 +550,7 @@ static qboolean GLimp_StartDriverAndSetMode( qboolean failSafe, qboolean fullscr
{
const char *driverName;
- if (SDL_Init(SDL_INIT_VIDEO) == -1)
+ if (SDL_Init(SDL_INIT_VIDEO) != 0)
{
ri.Printf( PRINT_ALL, "SDL_Init( SDL_INIT_VIDEO ) FAILED (%s)\n", SDL_GetError());
return qfalse;
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c
index 2b466744..700834c2 100644
--- a/src/sdl/sdl_input.c
+++ b/src/sdl/sdl_input.c
@@ -366,7 +366,7 @@ static void IN_ActivateMouse( void )
if( !mouseActive )
{
SDL_SetRelativeMouseMode( SDL_TRUE );
- SDL_SetWindowGrab( SDL_window, 1 );
+ SDL_SetWindowGrab( SDL_window, SDL_TRUE );
IN_GobbleMotionEvents( );
}
@@ -377,9 +377,9 @@ static void IN_ActivateMouse( void )
if( in_nograb->modified || !mouseActive )
{
if( in_nograb->integer )
- SDL_SetWindowGrab( SDL_window, 0 );
+ SDL_SetWindowGrab( SDL_window, SDL_FALSE );
else
- SDL_SetWindowGrab( SDL_window, 1 );
+ SDL_SetWindowGrab( SDL_window, SDL_TRUE );
in_nograb->modified = qfalse;
}
@@ -416,7 +416,7 @@ static void IN_DeactivateMouse( void )
{
IN_GobbleMotionEvents( );
- SDL_SetWindowGrab( SDL_window, 0 );
+ SDL_SetWindowGrab( SDL_window, SDL_FALSE );
SDL_SetRelativeMouseMode( SDL_FALSE );
// Don't warp the mouse unless the cursor is within the window
@@ -486,7 +486,7 @@ static void IN_InitJoystick( void )
if (!SDL_WasInit(SDL_INIT_JOYSTICK))
{
Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
- if (SDL_Init(SDL_INIT_JOYSTICK) == -1)
+ if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
{
Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", SDL_GetError());
return;
diff --git a/src/sdl/sdl_snd.c b/src/sdl/sdl_snd.c
index a087c486..9420f0ba 100644
--- a/src/sdl/sdl_snd.c
+++ b/src/sdl/sdl_snd.c
@@ -157,7 +157,7 @@ qboolean SNDDMA_Init(void)
if (!SDL_WasInit(SDL_INIT_AUDIO))
{
- if (SDL_Init(SDL_INIT_AUDIO) == -1)
+ if (SDL_Init(SDL_INIT_AUDIO) != 0)
{
Com_Printf( "FAILED (%s)\n", SDL_GetError( ) );
return qfalse;
generated by cgit (git 2.34.1) at 2025-04-08 01:56:54 +0000