ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Bump the minimum SDL version up to 1.2.10, and remove workarounds for earlier versions

Browse source
This commit is contained in:
Tim Angus 2009-10-25 22:36:32 +00:00
parent f9c4003186
commit 968892c61b
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
code/sdl/sdl_glimp.c
View file

@ -26,13 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# include <SDL.h> # include <SDL.h>
#endif #endif
#if !SDL_VERSION_ATLEAST(1, 2, 10)
#define SDL_GL_ACCELERATED_VISUAL 15
#define SDL_GL_SWAP_CONTROL 16
#elif MINSDL_PATCH >= 10
#error Code block no longer necessary, please remove
#endif
#ifdef SMP #ifdef SMP
# ifdef USE_LOCAL_HEADERS # ifdef USE_LOCAL_HEADERS
# include "SDL_thread.h" # include "SDL_thread.h"
@ -152,16 +145,8 @@ static void GLimp_DetectAvailableModes(void)
SDL_Rect **modes; SDL_Rect **modes;
int numModes; int numModes;
int i; int i;
SDL_PixelFormat *format = NULL;
#if SDL_VERSION_ATLEAST(1, 2, 10) modes = SDL_ListModes( videoInfo->vfmt, SDL_OPENGL | SDL_FULLSCREEN );
format = videoInfo->vfmt;
# if MINSDL_PATCH >= 10
# error Ifdeffery no longer necessary, please remove
# endif
#endif
modes = SDL_ListModes( format, SDL_OPENGL | SDL_FULLSCREEN );
if( !modes ) if( !modes )
{ {
@ -219,12 +204,6 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
if ( r_allowResize->integer ) if ( r_allowResize->integer )
flags |= SDL_RESIZABLE; flags |= SDL_RESIZABLE;
#if !SDL_VERSION_ATLEAST(1, 2, 10)
// 1.2.10 is needed to get the desktop resolution
displayAspect = 4.0f / 3.0f;
#elif MINSDL_PATCH >= 10
# error Ifdeffery no longer necessary, please remove
#else
if( videoInfo == NULL ) if( videoInfo == NULL )
{ {
static SDL_VideoInfo sVideoInfo; static SDL_VideoInfo sVideoInfo;
@ -254,7 +233,6 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
"Cannot estimate display aspect, assuming 1.333\n" ); "Cannot estimate display aspect, assuming 1.333\n" );
} }
} }
#endif
ri.Printf (PRINT_ALL, "...setting mode %d:", mode ); ri.Printf (PRINT_ALL, "...setting mode %d:", mode );

2
code/sys/sys_local.h
View file

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// Require a minimum version of SDL // Require a minimum version of SDL
#define MINSDL_MAJOR 1 #define MINSDL_MAJOR 1
#define MINSDL_MINOR 2 #define MINSDL_MINOR 2
#define MINSDL_PATCH 7 #define MINSDL_PATCH 10
// Input subsystem // Input subsystem
void IN_Init( void ); void IN_Init( void );