diff options
| author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-22 03:42:32 +0000 |
|---|---|---|
| committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-22 03:42:32 +0000 |
| commit | 33f302fec8eb69bc45451b1fb376b6a0b8ce0273 (patch) | |
| tree | c28944c39ce6118f0f9a8ef4c1966cf244aca523 | |
| parent | ff3eedfc732fec8b16f5ac77b9efe49df870ea13 (diff) | |
| download | ioquake3-aero-33f302fec8eb69bc45451b1fb376b6a0b8ce0273.tar.gz ioquake3-aero-33f302fec8eb69bc45451b1fb376b6a0b8ce0273.zip | |
* (bug 2972) add r_swapInterval support to SDL client (if libSDL >= 1.2.10)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1088 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/renderer/tr_init.c | 5 | ||||
| -rw-r--r-- | code/unix/sdl_glimp.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c index 513df4c..e67e7e4 100644 --- a/code/renderer/tr_init.c +++ b/code/renderer/tr_init.c @@ -979,7 +979,12 @@ void R_Register( void ) r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE ); r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE); r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE ); +#if USE_SDL_VIDEO + r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", + CVAR_ARCHIVE | CVAR_LATCH ); +#else r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE ); +#endif r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE ); r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE ); diff --git a/code/unix/sdl_glimp.c b/code/unix/sdl_glimp.c index 5640b70..71883a6 100644 --- a/code/unix/sdl_glimp.c +++ b/code/unix/sdl_glimp.c @@ -689,6 +689,13 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen ) SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, tstencilbits ); SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); +#if SDL_VERSION_ATLEAST( 1, 2, 10 ) + if( SDL_GL_SetAttribute( SDL_GL_SWAP_CONTROL, r_swapInterval->integer ) ) + ri.Printf( PRINT_ALL, "r_swapInterval requires libSDL >= 1.2.10\n" ); +#else + #warning libSDL >= 1.2.10 required for r_swapInterval support +#endif // SDL_GL_SWAP_CONTROL + SDL_WM_SetCaption(CLIENT_WINDOW_TITLE, CLIENT_WINDOW_ICON); SDL_ShowCursor(0); SDL_EnableUNICODE(1); |