ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-27 22:42:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Pass the "best" SDL_PixelFormat (as returned by the initial call to

Browse source 
SDL_GetVideoInfo) to SDL_ListModes; this fixes said function returning an
  empty list when using the "windib" driver
This commit is contained in:
Tim Angus 2008-08-13 19:39:38 +00:00
parent f2baf359ae
commit 49fa0edd61
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
code/sdl/sdl_glimp.c
View file

@ -76,6 +76,7 @@ typedef enum
} rserr_t; } rserr_t;
static SDL_Surface *screen = NULL; static SDL_Surface *screen = NULL;
static const SDL_VideoInfo *videoInfo = NULL;
cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained
cvar_t *r_sdlDriver; cvar_t *r_sdlDriver;
@ -150,8 +151,16 @@ static void GLimp_DetectAvailableModes(void)
SDL_Rect **modes; SDL_Rect **modes;
int numModes; int numModes;
int i; int i;
SDL_PixelFormat *format = NULL;
modes = SDL_ListModes( NULL, SDL_OPENGL | SDL_FULLSCREEN ); #if SDL_VERSION_ATLEAST(1, 2, 10)
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 )
{ {
@ -202,22 +211,32 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
int i = 0; int i = 0;
SDL_Surface *vidscreen = NULL; SDL_Surface *vidscreen = NULL;
Uint32 flags = SDL_OPENGL; Uint32 flags = SDL_OPENGL;
const SDL_VideoInfo *videoInfo;
ri.Printf( PRINT_ALL, "Initializing OpenGL display\n"); ri.Printf( PRINT_ALL, "Initializing OpenGL display\n");
if( displayAspect == 0.0f )
{
#if !SDL_VERSION_ATLEAST(1, 2, 10) #if !SDL_VERSION_ATLEAST(1, 2, 10)
// 1.2.10 is needed to get the desktop resolution // 1.2.10 is needed to get the desktop resolution
displayAspect = 4.0f / 3.0f; displayAspect = 4.0f / 3.0f;
#elif MINSDL_PATCH >= 10 #elif MINSDL_PATCH >= 10
# error Ifdeffery no longer necessary, please remove # error Ifdeffery no longer necessary, please remove
#else #else
if( videoInfo == NULL )
{
static SDL_VideoInfo sVideoInfo;
static SDL_PixelFormat sPixelFormat;
videoInfo = SDL_GetVideoInfo( );
// Take a copy of the videoInfo
Com_Memcpy( &sPixelFormat, videoInfo->vfmt, sizeof( SDL_PixelFormat ) );
sPixelFormat.palette = NULL; // Should already be the case
Com_Memcpy( &sVideoInfo, videoInfo, sizeof( SDL_VideoInfo ) );
sVideoInfo.vfmt = &sPixelFormat;
videoInfo = &sVideoInfo;
// Guess the display aspect ratio through the desktop resolution // Guess the display aspect ratio through the desktop resolution
// by assuming (relatively safely) that it is set at or close to // by assuming (relatively safely) that it is set at or close to
// the display's native aspect ratio // the display's native aspect ratio
videoInfo = SDL_GetVideoInfo( );
displayAspect = (float)videoInfo->current_w / (float)videoInfo->current_h; displayAspect = (float)videoInfo->current_w / (float)videoInfo->current_h;
#endif #endif