id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-03 09:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed missing SDL video initialization.

Browse source
This commit is contained in:
Robert Beckebans 2012-12-11 23:49:41 +01:00
parent 99f144c32f
commit b848312904
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
neo/sys/sdl/sdl_glimp.cpp
View file

@ -50,6 +50,9 @@ static SDL_Surface* window = NULL;
#define SDL_WINDOW_FULLSCREEN SDL_FULLSCREEN
#endif
bool QGL_Init( const char* dllname );
void QGL_Shutdown();
/*
===================
GLimp_Init
@ -59,7 +62,11 @@ bool GLimp_Init( glimpParms_t parms )
{
common->Printf( "Initializing OpenGL subsystem\n" );
assert( SDL_WasInit( SDL_INIT_VIDEO ) );
if( !SDL_WasInit( SDL_INIT_VIDEO ) )
{
if( SDL_Init( SDL_INIT_VIDEO ) )
common->Error( "Error while initializing SDL: %s", SDL_GetError() );
}
Uint32 flags = SDL_WINDOW_OPENGL;
@ -133,6 +140,7 @@ bool GLimp_Init( glimpParms_t parms )
if( tcolorbits == 24 )
channelcolorbits = 8;
#if 1
SDL_GL_SetAttribute( SDL_GL_RED_SIZE, channelcolorbits );
SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, channelcolorbits );
SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, channelcolorbits );
@ -149,6 +157,7 @@ bool GLimp_Init( glimpParms_t parms )
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, parms.multiSamples ? 1 : 0 );
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, parms.multiSamples );
#endif
#if SDL_VERSION_ATLEAST(2, 0, 0)
window = SDL_CreateWindow( GAME_NAME,
@ -215,6 +224,8 @@ bool GLimp_Init( glimpParms_t parms )
return false;
}
QGL_Init( "nodriverlib" );
return true;
}
@ -251,6 +262,8 @@ void GLimp_Shutdown()
window = NULL;
}
#endif
QGL_Shutdown();
}
/*