Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11gl.c @ 4287:0620847bf1a8 SDL-1.2
Fixed bug #798
kty@lavabit.com 2009-09-19 14:19:04 PDT
The stable release of SDL 1.2.13 for BeOS/Haiku has a bug in
BE_FindClosestFSMode that causes it to sometimes not select the best mode when
going fullscreen. There are in fact two bugs in the implementation but I will
not go into specifics because there is already a patch for it in the developer
SVN 1.3. However I am still reporting it because I believe the following code
is a better patch for the issue. The current implementation on SVN only works
if it is able to find an exact match for the requested mode. However, by
scanning from lowest-to-highest resolution instead of highest-to-lowest, one
can find the best mode at all times
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 10 Oct 2009 02:11:07 +0000 |
| parents | d48035d857d3 |
| children | 91c458013850 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
180
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #include "SDL_x11video.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
25 #include "../../events/SDL_events_c.h" |
| 0 | 26 #include "SDL_x11dga_c.h" |
| 27 #include "SDL_x11gl_c.h" | |
| 28 | |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
29 #if defined(__IRIX__) |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
30 /* IRIX doesn't have a GL library versioning system */ |
|
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
31 #define DEFAULT_OPENGL "libGL.so" |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
32 #elif defined(__MACOSX__) |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1182
diff
changeset
|
33 #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
34 #elif defined(__QNXNTO__) |
|
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
35 #define DEFAULT_OPENGL "libGL.so.3" |
|
4023
5ec68276e4de
Applied patch from OpenBSD ports package
Sam Lantinga <slouken@libsdl.org>
parents:
3940
diff
changeset
|
36 #elif defined(__OpenBSD__) |
|
5ec68276e4de
Applied patch from OpenBSD ports package
Sam Lantinga <slouken@libsdl.org>
parents:
3940
diff
changeset
|
37 #define DEFAULT_OPENGL "libGL.so.4.0" |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
38 #else |
| 0 | 39 #define DEFAULT_OPENGL "libGL.so.1" |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
40 #endif |
| 0 | 41 |
|
667
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
42 #ifndef GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
43 #define GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
44 #define GLX_SAMPLE_BUFFERS_ARB 100000 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
45 #define GLX_SAMPLES_ARB 100001 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
46 #endif |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
47 |
|
4183
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
48 /* GLX_EXT_visual_rating stuff that might not be in the system headers... */ |
|
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
49 #ifndef GLX_VISUAL_CAVEAT_EXT |
| 1737 | 50 #define GLX_VISUAL_CAVEAT_EXT 0x20 |
|
4183
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
51 #endif |
|
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
52 #ifndef GLX_NONE_EXT |
|
1841
0495a8e98595
Use the correct parameter for GLX_VISUAL_CAVEAT_EXT
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
53 #define GLX_NONE_EXT 0x8000 |
|
4183
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
54 #endif |
|
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
55 #ifndef GLX_SLOW_VISUAL_EXT |
| 1737 | 56 #define GLX_SLOW_VISUAL_EXT 0x8001 |
|
4183
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
57 #endif |
|
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
58 #ifndef GLX_NON_CONFORMANT_VISUAL_EXT |
| 1737 | 59 #define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D |
| 60 #endif | |
| 61 | |
|
4183
39e748f251c6
Patched X11 code to compile on Mac OS X 10.6 SDK.
Ryan C. Gordon <icculus@icculus.org>
parents:
4159
diff
changeset
|
62 |
| 1737 | 63 #if SDL_VIDEO_OPENGL_GLX |
| 64 static int glXExtensionSupported(_THIS, const char *extension) | |
| 65 { | |
| 66 const char *extensions; | |
| 67 const char *start; | |
| 68 const char *where, *terminator; | |
| 69 | |
| 70 /* Extension names should not have spaces. */ | |
| 71 where = SDL_strchr(extension, ' '); | |
| 72 if ( where || *extension == '\0' ) { | |
| 73 return 0; | |
| 74 } | |
| 75 | |
| 76 extensions = this->gl_data->glXQueryExtensionsString(GFX_Display,SDL_Screen); | |
| 77 /* It takes a bit of care to be fool-proof about parsing the | |
| 78 * OpenGL extensions string. Don't be fooled by sub-strings, etc. | |
| 79 */ | |
| 80 | |
| 81 start = extensions; | |
| 82 | |
| 83 for (;;) { | |
| 84 where = SDL_strstr(start, extension); | |
| 85 if (!where) break; | |
| 86 | |
| 87 terminator = where + strlen(extension); | |
| 88 if (where == start || *(where - 1) == ' ') | |
| 89 if (*terminator == ' ' || *terminator == '\0') return 1; | |
| 90 | |
| 91 start = terminator; | |
| 92 } | |
| 93 return 0; | |
| 94 } | |
| 95 #endif /* SDL_VIDEO_OPENGL_GLX */ | |
| 96 | |
| 0 | 97 XVisualInfo *X11_GL_GetVisual(_THIS) |
| 98 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
99 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 100 /* 64 seems nice. */ |
| 101 int attribs[64]; | |
| 102 int i; | |
| 103 | |
| 104 /* load the gl driver from a default path */ | |
| 105 if ( ! this->gl_config.driver_loaded ) { | |
| 106 /* no driver has been loaded, use default (ourselves) */ | |
| 107 if ( X11_GL_LoadLibrary(this, NULL) < 0 ) { | |
| 108 return NULL; | |
| 109 } | |
| 110 } | |
| 111 | |
| 112 /* See if we already have a window which we must use */ | |
| 113 if ( SDL_windowid ) { | |
| 114 XWindowAttributes a; | |
| 115 XVisualInfo vi_in; | |
| 116 int out_count; | |
| 117 | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
118 XGetWindowAttributes(SDL_Display, SDL_Window, &a); |
| 0 | 119 vi_in.screen = SDL_Screen; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
120 vi_in.visualid = XVisualIDFromVisual(a.visual); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
121 glx_visualinfo = XGetVisualInfo(SDL_Display, |
| 0 | 122 VisualScreenMask|VisualIDMask, &vi_in, &out_count); |
| 123 return glx_visualinfo; | |
| 124 } | |
| 125 | |
| 126 /* Setup our GLX attributes according to the gl_config. */ | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
127 i = 0; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
128 attribs[i++] = GLX_RGBA; |
| 0 | 129 attribs[i++] = GLX_RED_SIZE; |
| 130 attribs[i++] = this->gl_config.red_size; | |
| 131 attribs[i++] = GLX_GREEN_SIZE; | |
| 132 attribs[i++] = this->gl_config.green_size; | |
| 133 attribs[i++] = GLX_BLUE_SIZE; | |
| 134 attribs[i++] = this->gl_config.blue_size; | |
| 135 | |
| 136 if( this->gl_config.alpha_size ) { | |
| 137 attribs[i++] = GLX_ALPHA_SIZE; | |
| 138 attribs[i++] = this->gl_config.alpha_size; | |
| 139 } | |
| 140 | |
| 141 if( this->gl_config.buffer_size ) { | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
142 attribs[i++] = GLX_BUFFER_SIZE; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
143 attribs[i++] = this->gl_config.buffer_size; |
| 0 | 144 } |
| 145 | |
| 146 if( this->gl_config.double_buffer ) { | |
| 147 attribs[i++] = GLX_DOUBLEBUFFER; | |
| 148 } | |
| 149 | |
| 150 attribs[i++] = GLX_DEPTH_SIZE; | |
| 151 attribs[i++] = this->gl_config.depth_size; | |
| 152 | |
| 153 if( this->gl_config.stencil_size ) { | |
| 154 attribs[i++] = GLX_STENCIL_SIZE; | |
| 155 attribs[i++] = this->gl_config.stencil_size; | |
| 156 } | |
| 157 | |
| 158 if( this->gl_config.accum_red_size ) { | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
159 attribs[i++] = GLX_ACCUM_RED_SIZE; |
| 0 | 160 attribs[i++] = this->gl_config.accum_red_size; |
| 161 } | |
| 162 | |
| 163 if( this->gl_config.accum_green_size ) { | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
164 attribs[i++] = GLX_ACCUM_GREEN_SIZE; |
| 0 | 165 attribs[i++] = this->gl_config.accum_green_size; |
| 166 } | |
| 167 | |
| 168 if( this->gl_config.accum_blue_size ) { | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
169 attribs[i++] = GLX_ACCUM_BLUE_SIZE; |
| 0 | 170 attribs[i++] = this->gl_config.accum_blue_size; |
| 171 } | |
| 172 | |
| 173 if( this->gl_config.accum_alpha_size ) { | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
174 attribs[i++] = GLX_ACCUM_ALPHA_SIZE; |
| 0 | 175 attribs[i++] = this->gl_config.accum_alpha_size; |
| 176 } | |
| 177 | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
178 if( this->gl_config.stereo ) { |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
179 attribs[i++] = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
180 } |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
181 |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
182 if( this->gl_config.multisamplebuffers ) { |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
183 attribs[i++] = GLX_SAMPLE_BUFFERS_ARB; |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
184 attribs[i++] = this->gl_config.multisamplebuffers; |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
185 } |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
186 |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
187 if( this->gl_config.multisamplesamples ) { |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
188 attribs[i++] = GLX_SAMPLES_ARB; |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
189 attribs[i++] = this->gl_config.multisamplesamples; |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
190 } |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
191 |
| 1737 | 192 if( this->gl_config.accelerated >= 0 && |
| 193 glXExtensionSupported(this, "GLX_EXT_visual_rating") ) { | |
| 194 attribs[i++] = GLX_VISUAL_CAVEAT_EXT; | |
|
1841
0495a8e98595
Use the correct parameter for GLX_VISUAL_CAVEAT_EXT
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
195 attribs[i++] = GLX_NONE_EXT; |
| 1737 | 196 } |
| 197 | |
| 0 | 198 #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
199 if ( !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
|
1060
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
200 attribs[i++] = GLX_X_VISUAL_TYPE; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
201 attribs[i++] = GLX_DIRECT_COLOR; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
202 } |
| 0 | 203 #endif |
| 204 attribs[i++] = None; | |
| 205 | |
| 206 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 207 SDL_Screen, attribs); | |
| 208 #ifdef GLX_DIRECT_COLOR | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
209 if( !glx_visualinfo && !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { /* No DirectColor visual? Try again.. */ |
| 0 | 210 attribs[i-3] = None; |
| 211 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 212 SDL_Screen, attribs); | |
| 213 } | |
| 214 #endif | |
| 215 if( !glx_visualinfo ) { | |
| 216 SDL_SetError( "Couldn't find matching GLX visual"); | |
| 217 return NULL; | |
| 218 } | |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
219 /* |
|
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
220 printf("Found GLX visual 0x%x\n", glx_visualinfo->visualid); |
|
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
221 */ |
| 0 | 222 return glx_visualinfo; |
| 223 #else | |
| 224 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 225 return NULL; | |
| 226 #endif | |
| 227 } | |
| 228 | |
| 229 int X11_GL_CreateWindow(_THIS, int w, int h) | |
| 230 { | |
| 231 int retval; | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
232 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 233 XSetWindowAttributes attributes; |
| 234 unsigned long mask; | |
| 235 unsigned long black; | |
| 236 | |
| 237 black = (glx_visualinfo->visual == DefaultVisual(SDL_Display, | |
| 238 SDL_Screen)) | |
| 239 ? BlackPixel(SDL_Display, SDL_Screen) : 0; | |
| 240 attributes.background_pixel = black; | |
| 241 attributes.border_pixel = black; | |
| 242 attributes.colormap = SDL_XColorMap; | |
| 243 mask = CWBackPixel | CWBorderPixel | CWColormap; | |
| 244 | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
245 SDL_Window = XCreateWindow(SDL_Display, WMwindow, |
| 0 | 246 0, 0, w, h, 0, glx_visualinfo->depth, |
| 247 InputOutput, glx_visualinfo->visual, | |
| 248 mask, &attributes); | |
| 249 if ( !SDL_Window ) { | |
| 250 SDL_SetError("Could not create window"); | |
| 251 return -1; | |
| 252 } | |
| 253 retval = 0; | |
| 254 #else | |
| 255 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 256 retval = -1; | |
| 257 #endif | |
| 258 return(retval); | |
| 259 } | |
| 260 | |
| 261 int X11_GL_CreateContext(_THIS) | |
| 262 { | |
| 263 int retval; | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
264 #if SDL_VIDEO_OPENGL_GLX |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
265 |
| 0 | 266 /* We do this to create a clean separation between X and GLX errors. */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
267 XSync( SDL_Display, False ); |
| 0 | 268 glx_context = this->gl_data->glXCreateContext(GFX_Display, |
| 269 glx_visualinfo, NULL, True); | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
270 XSync( GFX_Display, False ); |
| 0 | 271 |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
272 if ( glx_context == NULL ) { |
| 0 | 273 SDL_SetError("Could not create GL context"); |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
274 return(-1); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
275 } |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
276 if ( X11_GL_MakeCurrent(this) < 0 ) { |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
277 return(-1); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
278 } |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
279 gl_active = 1; |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
280 |
|
3940
cb04355ffec4
Check correct glX extension name for swap_control, but it doesn't look like
Ryan C. Gordon <icculus@icculus.org>
parents:
3905
diff
changeset
|
281 if ( !glXExtensionSupported(this, "GLX_SGI_swap_control") ) { |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
282 this->gl_data->glXSwapIntervalSGI = NULL; |
| 0 | 283 } |
| 1737 | 284 if ( !glXExtensionSupported(this, "GLX_MESA_swap_control") ) { |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
285 this->gl_data->glXSwapIntervalMESA = NULL; |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
286 this->gl_data->glXGetSwapIntervalMESA = NULL; |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
287 } |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
288 if ( this->gl_config.swap_control >= 0 ) { |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
289 if ( this->gl_data->glXSwapIntervalMESA ) { |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
290 this->gl_data->glXSwapIntervalMESA(this->gl_config.swap_control); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
291 } else if ( this->gl_data->glXSwapIntervalSGI ) { |
|
4268
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
292 if (this->gl_data->glXSwapIntervalSGI(this->gl_config.swap_control) != 0) { |
|
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
293 this->gl_data->sgi_swap_interval = this->gl_config.swap_control; |
|
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
294 } |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
295 } |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
296 } |
| 0 | 297 #else |
| 298 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 299 #endif | |
| 300 if ( gl_active ) { | |
| 301 retval = 0; | |
| 302 } else { | |
| 303 retval = -1; | |
| 304 } | |
| 305 return(retval); | |
| 306 } | |
| 307 | |
| 308 void X11_GL_Shutdown(_THIS) | |
| 309 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
310 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 311 /* Clean up OpenGL */ |
| 312 if( glx_context ) { | |
| 313 this->gl_data->glXMakeCurrent(GFX_Display, None, NULL); | |
| 314 | |
| 315 if (glx_context != NULL) | |
| 316 this->gl_data->glXDestroyContext(GFX_Display, glx_context); | |
| 317 | |
| 318 glx_context = NULL; | |
| 319 } | |
| 320 gl_active = 0; | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
321 #endif /* SDL_VIDEO_OPENGL_GLX */ |
| 0 | 322 } |
| 323 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
324 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 325 |
| 326 /* Make the current context active */ | |
| 327 int X11_GL_MakeCurrent(_THIS) | |
| 328 { | |
| 329 int retval; | |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
330 |
| 0 | 331 retval = 0; |
| 332 if ( ! this->gl_data->glXMakeCurrent(GFX_Display, | |
| 333 SDL_Window, glx_context) ) { | |
| 334 SDL_SetError("Unable to make GL context current"); | |
| 335 retval = -1; | |
| 336 } | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
337 XSync( GFX_Display, False ); |
| 0 | 338 |
| 339 /* More Voodoo X server workarounds... Grr... */ | |
| 340 SDL_Lock_EventThread(); | |
| 341 X11_CheckDGAMouse(this); | |
| 342 SDL_Unlock_EventThread(); | |
| 343 | |
| 344 return(retval); | |
| 345 } | |
| 346 | |
| 347 /* Get attribute data from glX. */ | |
| 348 int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value) | |
| 349 { | |
|
4092
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
350 int retval = -1; |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
351 int unsupported = 0; |
| 0 | 352 int glx_attrib = None; |
| 353 | |
| 354 switch( attrib ) { | |
| 355 case SDL_GL_RED_SIZE: | |
| 356 glx_attrib = GLX_RED_SIZE; | |
| 357 break; | |
| 358 case SDL_GL_GREEN_SIZE: | |
| 359 glx_attrib = GLX_GREEN_SIZE; | |
| 360 break; | |
| 361 case SDL_GL_BLUE_SIZE: | |
| 362 glx_attrib = GLX_BLUE_SIZE; | |
| 363 break; | |
| 364 case SDL_GL_ALPHA_SIZE: | |
| 365 glx_attrib = GLX_ALPHA_SIZE; | |
| 366 break; | |
| 367 case SDL_GL_DOUBLEBUFFER: | |
| 368 glx_attrib = GLX_DOUBLEBUFFER; | |
| 369 break; | |
| 370 case SDL_GL_BUFFER_SIZE: | |
| 371 glx_attrib = GLX_BUFFER_SIZE; | |
| 372 break; | |
| 373 case SDL_GL_DEPTH_SIZE: | |
| 374 glx_attrib = GLX_DEPTH_SIZE; | |
| 375 break; | |
| 376 case SDL_GL_STENCIL_SIZE: | |
| 377 glx_attrib = GLX_STENCIL_SIZE; | |
| 378 break; | |
| 379 case SDL_GL_ACCUM_RED_SIZE: | |
| 380 glx_attrib = GLX_ACCUM_RED_SIZE; | |
| 381 break; | |
| 382 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 383 glx_attrib = GLX_ACCUM_GREEN_SIZE; | |
| 384 break; | |
| 385 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 386 glx_attrib = GLX_ACCUM_BLUE_SIZE; | |
| 387 break; | |
| 388 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 389 glx_attrib = GLX_ACCUM_ALPHA_SIZE; | |
| 390 break; | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
391 case SDL_GL_STEREO: |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
392 glx_attrib = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
393 break; |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
394 case SDL_GL_MULTISAMPLEBUFFERS: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
395 glx_attrib = GLX_SAMPLE_BUFFERS_ARB; |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
396 break; |
|
656
864e2d2a9a55
Merged in Ryan's multisample code for MacOS, and changed the constants to match.
Sam Lantinga <slouken@libsdl.org>
parents:
655
diff
changeset
|
397 case SDL_GL_MULTISAMPLESAMPLES: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
398 glx_attrib = GLX_SAMPLES_ARB; |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
399 break; |
| 1737 | 400 case SDL_GL_ACCELERATED_VISUAL: |
| 401 if ( glXExtensionSupported(this, "GLX_EXT_visual_rating") ) { | |
| 402 glx_attrib = GLX_VISUAL_CAVEAT_EXT; | |
| 403 retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value); | |
| 404 if ( *value == GLX_SLOW_VISUAL_EXT ) { | |
| 405 *value = SDL_FALSE; | |
| 406 } else { | |
| 407 *value = SDL_TRUE; | |
| 408 } | |
| 409 return retval; | |
| 410 } else { | |
|
4092
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
411 unsupported = 1; |
| 1737 | 412 } |
| 413 break; | |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
414 case SDL_GL_SWAP_CONTROL: |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
415 if ( this->gl_data->glXGetSwapIntervalMESA ) { |
| 1880 | 416 *value = this->gl_data->glXGetSwapIntervalMESA(); |
|
4268
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
417 return 0; |
|
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
418 } else if ( this->gl_data->glXSwapIntervalSGI ) { |
|
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
419 *value = this->gl_data->sgi_swap_interval; |
|
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4183
diff
changeset
|
420 return 0; |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
421 } else { |
|
4092
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
422 unsupported = 1; |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
423 } |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
424 break; |
| 0 | 425 default: |
|
4092
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
426 unsupported = 1; |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
427 break; |
| 0 | 428 } |
| 429 | |
|
4092
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
430 if (unsupported) { |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
431 SDL_SetError("OpenGL attribute is unsupported on this system"); |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
432 } else { |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
433 retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value); |
|
2b32a416d202
Set an error message when SDL_GL_SetAttribute() fails because we can't support
Ryan C. Gordon <icculus@icculus.org>
parents:
4023
diff
changeset
|
434 } |
| 0 | 435 return retval; |
| 436 } | |
| 437 | |
| 438 void X11_GL_SwapBuffers(_THIS) | |
| 439 { | |
| 440 this->gl_data->glXSwapBuffers(GFX_Display, SDL_Window); | |
| 441 } | |
| 442 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
443 #endif /* SDL_VIDEO_OPENGL_GLX */ |
| 0 | 444 |
| 1861 | 445 #define OPENGL_REQUIRS_DLOPEN |
| 446 #if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN) | |
| 447 #include <dlfcn.h> | |
| 448 #define GL_LoadObject(X) dlopen(X, (RTLD_NOW|RTLD_GLOBAL)) | |
| 449 #define GL_LoadFunction dlsym | |
| 450 #define GL_UnloadObject dlclose | |
| 451 #else | |
| 452 #define GL_LoadObject SDL_LoadObject | |
| 453 #define GL_LoadFunction SDL_LoadFunction | |
| 454 #define GL_UnloadObject SDL_UnloadObject | |
| 455 #endif | |
| 456 | |
| 0 | 457 void X11_GL_UnloadLibrary(_THIS) |
| 458 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
459 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 460 if ( this->gl_config.driver_loaded ) { |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1182
diff
changeset
|
461 |
| 1861 | 462 GL_UnloadObject(this->gl_config.dll_handle); |
| 0 | 463 |
| 464 this->gl_data->glXGetProcAddress = NULL; | |
| 465 this->gl_data->glXChooseVisual = NULL; | |
| 466 this->gl_data->glXCreateContext = NULL; | |
| 467 this->gl_data->glXDestroyContext = NULL; | |
| 468 this->gl_data->glXMakeCurrent = NULL; | |
| 469 this->gl_data->glXSwapBuffers = NULL; | |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
470 this->gl_data->glXSwapIntervalSGI = NULL; |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
471 this->gl_data->glXSwapIntervalMESA = NULL; |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
472 this->gl_data->glXGetSwapIntervalMESA = NULL; |
| 0 | 473 |
| 474 this->gl_config.dll_handle = NULL; | |
| 475 this->gl_config.driver_loaded = 0; | |
| 476 } | |
| 477 #endif | |
| 478 } | |
| 479 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
480 #if SDL_VIDEO_OPENGL_GLX |
|
1182
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
481 |
| 0 | 482 /* Passing a NULL path means load pointers from the application */ |
| 483 int X11_GL_LoadLibrary(_THIS, const char* path) | |
| 484 { | |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1182
diff
changeset
|
485 void* handle = NULL; |
| 0 | 486 |
|
1182
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
487 if ( gl_active ) { |
|
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
488 SDL_SetError("OpenGL context already created"); |
|
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
489 return -1; |
|
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
490 } |
|
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
491 |
|
e8e8dcb68e7a
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
492 if ( path == NULL ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
493 path = SDL_getenv("SDL_VIDEO_GL_DRIVER"); |
| 0 | 494 if ( path == NULL ) { |
| 495 path = DEFAULT_OPENGL; | |
| 496 } | |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1182
diff
changeset
|
497 } |
|
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1182
diff
changeset
|
498 |
| 1861 | 499 handle = GL_LoadObject(path); |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
500 if ( handle == NULL ) { |
|
3905
0e0883cb7137
Add error message if not using SDL_LoadObject
Patrice Mandin <patmandin@gmail.com>
parents:
1880
diff
changeset
|
501 #if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN) |
|
0e0883cb7137
Add error message if not using SDL_LoadObject
Patrice Mandin <patmandin@gmail.com>
parents:
1880
diff
changeset
|
502 SDL_SetError("Failed loading %s", path); |
|
0e0883cb7137
Add error message if not using SDL_LoadObject
Patrice Mandin <patmandin@gmail.com>
parents:
1880
diff
changeset
|
503 #else |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
504 /* SDL_LoadObject() will call SDL_SetError() for us. */ |
|
3905
0e0883cb7137
Add error message if not using SDL_LoadObject
Patrice Mandin <patmandin@gmail.com>
parents:
1880
diff
changeset
|
505 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
506 return -1; |
| 0 | 507 } |
| 508 | |
| 509 /* Unload the old driver and reset the pointers */ | |
| 510 X11_GL_UnloadLibrary(this); | |
| 511 | |
| 512 /* Load new function pointers */ | |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
513 this->gl_data->glXGetProcAddress = |
| 1861 | 514 (void *(*)(const GLubyte *)) GL_LoadFunction(handle, "glXGetProcAddressARB"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
515 this->gl_data->glXChooseVisual = |
| 1861 | 516 (XVisualInfo *(*)(Display *, int, int *)) GL_LoadFunction(handle, "glXChooseVisual"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
517 this->gl_data->glXCreateContext = |
| 1861 | 518 (GLXContext (*)(Display *, XVisualInfo *, GLXContext, int)) GL_LoadFunction(handle, "glXCreateContext"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
519 this->gl_data->glXDestroyContext = |
| 1861 | 520 (void (*)(Display *, GLXContext)) GL_LoadFunction(handle, "glXDestroyContext"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
521 this->gl_data->glXMakeCurrent = |
| 1861 | 522 (int (*)(Display *, GLXDrawable, GLXContext)) GL_LoadFunction(handle, "glXMakeCurrent"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
523 this->gl_data->glXSwapBuffers = |
| 1861 | 524 (void (*)(Display *, GLXDrawable)) GL_LoadFunction(handle, "glXSwapBuffers"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
525 this->gl_data->glXGetConfig = |
| 1861 | 526 (int (*)(Display *, XVisualInfo *, int, int *)) GL_LoadFunction(handle, "glXGetConfig"); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
527 this->gl_data->glXQueryExtensionsString = |
| 1861 | 528 (const char *(*)(Display *, int)) GL_LoadFunction(handle, "glXQueryExtensionsString"); |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
529 this->gl_data->glXSwapIntervalSGI = |
| 1861 | 530 (int (*)(int)) GL_LoadFunction(handle, "glXSwapIntervalSGI"); |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
531 this->gl_data->glXSwapIntervalMESA = |
| 1861 | 532 (GLint (*)(unsigned)) GL_LoadFunction(handle, "glXSwapIntervalMESA"); |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1577
diff
changeset
|
533 this->gl_data->glXGetSwapIntervalMESA = |
| 1861 | 534 (GLint (*)(void)) GL_LoadFunction(handle, "glXGetSwapIntervalMESA"); |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
535 |
| 0 | 536 if ( (this->gl_data->glXChooseVisual == NULL) || |
| 537 (this->gl_data->glXCreateContext == NULL) || | |
| 538 (this->gl_data->glXDestroyContext == NULL) || | |
| 539 (this->gl_data->glXMakeCurrent == NULL) || | |
| 540 (this->gl_data->glXSwapBuffers == NULL) || | |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
541 (this->gl_data->glXGetConfig == NULL) || |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
542 (this->gl_data->glXQueryExtensionsString == NULL)) { |
| 0 | 543 SDL_SetError("Could not retrieve OpenGL functions"); |
| 544 return -1; | |
| 545 } | |
| 546 | |
| 547 this->gl_config.dll_handle = handle; | |
| 548 this->gl_config.driver_loaded = 1; | |
| 549 if ( path ) { | |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
550 SDL_strlcpy(this->gl_config.driver_path, path, |
|
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
551 SDL_arraysize(this->gl_config.driver_path)); |
| 0 | 552 } else { |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
553 *this->gl_config.driver_path = '\0'; |
| 0 | 554 } |
| 555 return 0; | |
| 556 } | |
| 557 | |
| 558 void *X11_GL_GetProcAddress(_THIS, const char* proc) | |
| 559 { | |
| 560 void* handle; | |
| 561 | |
| 562 handle = this->gl_config.dll_handle; | |
| 563 if ( this->gl_data->glXGetProcAddress ) { | |
|
1196
b81f54c3963f
Fixed compile warnings with gcc 4
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
564 return this->gl_data->glXGetProcAddress((const GLubyte *)proc); |
| 0 | 565 } |
| 1861 | 566 return GL_LoadFunction(handle, proc); |
| 0 | 567 } |
| 568 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
569 #endif /* SDL_VIDEO_OPENGL_GLX */ |