summaryrefslogtreecommitdiff
path: root/src/sdl
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2014-03-17 12:04:59 -0500
committerTim Angus <tim@ngus.net>2014-08-28 11:03:32 +0100
commit515b6ee81240c720ad3fc10940d8f0c6e874fd9c (patch)
tree5c20a01a563eb0d064bc5e504ecdb293ae40a704 /src/sdl
parent2818a6da1e1c4a66ce01fe06d12cffd996c40237 (diff)
Fix multisampling on X11
Setting SDL_GL_ACCELERATED_VISUAL was disabled for ioq3 SDL 1.2 for other reasons. However, it causes creating GL context to fail if multisampling is enabled on X11 for both SDL1.2 and SDL2. Tested using nVidia proprietary driver on Debian 7.
Diffstat (limited to 'src/sdl')
-rw-r--r--src/sdl/sdl_glimp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 6c313cda..3b619b1b 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -422,9 +422,11 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+#if 0 // if multisampling is enabled on X11, this causes create window to fail.
// If not allowing software GL, demand accelerated
if( !r_allowSoftwareGL->integer )
SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 1 );
+#endif
if( ( SDL_window = SDL_CreateWindow( CLIENT_WINDOW_TITLE, x, y,
glConfig.vidWidth, glConfig.vidHeight, flags ) ) == 0 )