Mercurial > sdl-ios-xcode
comparison src/video/x11/SDL_x11gl.c @ 1659:14717b52abc0 SDL-1.3
Merge trunk-1.3-3
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 17 May 2006 08:18:28 +0000 |
parents | 96c2f89cc7e1 |
children | 782fd950bd46 |
comparison
equal
deleted
inserted
replaced
1658:e49147870aac | 1659:14717b52abc0 |
---|---|
44 #endif | 44 #endif |
45 | 45 |
46 #ifndef GLX_EXT_visual_rating | 46 #ifndef GLX_EXT_visual_rating |
47 #define GLX_EXT_visual_rating | 47 #define GLX_EXT_visual_rating |
48 #define GLX_VISUAL_CAVEAT_EXT 0x20 | 48 #define GLX_VISUAL_CAVEAT_EXT 0x20 |
49 #define GLX_NONE_EXT 0x8000 | |
49 #define GLX_SLOW_VISUAL_EXT 0x8001 | 50 #define GLX_SLOW_VISUAL_EXT 0x8001 |
50 #define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D | 51 #define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D |
51 #endif | 52 #endif |
52 | 53 |
53 #if SDL_VIDEO_OPENGL_GLX | 54 #if SDL_VIDEO_OPENGL_GLX |
180 } | 181 } |
181 | 182 |
182 if( this->gl_config.accelerated >= 0 && | 183 if( this->gl_config.accelerated >= 0 && |
183 glXExtensionSupported(this, "GLX_EXT_visual_rating") ) { | 184 glXExtensionSupported(this, "GLX_EXT_visual_rating") ) { |
184 attribs[i++] = GLX_VISUAL_CAVEAT_EXT; | 185 attribs[i++] = GLX_VISUAL_CAVEAT_EXT; |
185 attribs[i++] = this->gl_config.accelerated ? GLX_NONE : GLX_DONT_CARE; | 186 attribs[i++] = GLX_NONE_EXT; |
186 } | 187 } |
187 | 188 |
188 #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */ | 189 #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */ |
189 if ( !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { | 190 if ( !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
190 attribs[i++] = GLX_X_VISUAL_TYPE; | 191 attribs[i++] = GLX_X_VISUAL_TYPE; |