Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11gl.c @ 1319:66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
when it should be != NULL.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 01 Feb 2006 19:59:02 +0000 |
| parents | e94b0d7c33bc |
| children | 3692456e7b0f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1247
diff
changeset
|
3 Copyright (C) 1997-2006 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 */ |
| 22 | |
| 23 #include <stdlib.h> /* For getenv() prototype */ | |
| 24 #include <string.h> | |
| 25 | |
| 26 #include "SDL_events_c.h" | |
| 27 #include "SDL_error.h" | |
| 28 #include "SDL_x11video.h" | |
| 29 #include "SDL_x11dga_c.h" | |
| 30 #include "SDL_x11gl_c.h" | |
| 31 | |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
32 #if defined(sgi) |
|
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
33 /* 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
|
34 #define DEFAULT_OPENGL "libGL.so" |
|
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
|
35 #elif defined(MACOSX) |
|
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
|
36 #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
37 #else |
| 0 | 38 #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
|
39 #endif |
| 0 | 40 |
|
667
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
41 #ifndef GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
42 #define GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
43 #define GLX_SAMPLE_BUFFERS_ARB 100000 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
44 #define GLX_SAMPLES_ARB 100001 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
45 #endif |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
46 |
| 0 | 47 XVisualInfo *X11_GL_GetVisual(_THIS) |
| 48 { | |
|
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
|
49 #ifdef HAVE_OPENGL_X11 |
| 0 | 50 /* 64 seems nice. */ |
| 51 int attribs[64]; | |
| 52 int i; | |
| 53 | |
| 54 /* load the gl driver from a default path */ | |
| 55 if ( ! this->gl_config.driver_loaded ) { | |
| 56 /* no driver has been loaded, use default (ourselves) */ | |
| 57 if ( X11_GL_LoadLibrary(this, NULL) < 0 ) { | |
| 58 return NULL; | |
| 59 } | |
| 60 } | |
| 61 | |
| 62 /* See if we already have a window which we must use */ | |
| 63 if ( SDL_windowid ) { | |
| 64 XWindowAttributes a; | |
| 65 XVisualInfo vi_in; | |
| 66 int out_count; | |
| 67 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
68 pXGetWindowAttributes(SDL_Display, SDL_Window, &a); |
| 0 | 69 vi_in.screen = SDL_Screen; |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
70 vi_in.visualid = pXVisualIDFromVisual(a.visual); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
71 glx_visualinfo = pXGetVisualInfo(SDL_Display, |
| 0 | 72 VisualScreenMask|VisualIDMask, &vi_in, &out_count); |
| 73 return glx_visualinfo; | |
| 74 } | |
| 75 | |
| 76 /* 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
|
77 i = 0; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
78 attribs[i++] = GLX_RGBA; |
| 0 | 79 attribs[i++] = GLX_RED_SIZE; |
| 80 attribs[i++] = this->gl_config.red_size; | |
| 81 attribs[i++] = GLX_GREEN_SIZE; | |
| 82 attribs[i++] = this->gl_config.green_size; | |
| 83 attribs[i++] = GLX_BLUE_SIZE; | |
| 84 attribs[i++] = this->gl_config.blue_size; | |
| 85 | |
| 86 if( this->gl_config.alpha_size ) { | |
| 87 attribs[i++] = GLX_ALPHA_SIZE; | |
| 88 attribs[i++] = this->gl_config.alpha_size; | |
| 89 } | |
| 90 | |
| 91 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
|
92 attribs[i++] = GLX_BUFFER_SIZE; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
93 attribs[i++] = this->gl_config.buffer_size; |
| 0 | 94 } |
| 95 | |
| 96 if( this->gl_config.double_buffer ) { | |
| 97 attribs[i++] = GLX_DOUBLEBUFFER; | |
| 98 } | |
| 99 | |
| 100 attribs[i++] = GLX_DEPTH_SIZE; | |
| 101 attribs[i++] = this->gl_config.depth_size; | |
| 102 | |
| 103 if( this->gl_config.stencil_size ) { | |
| 104 attribs[i++] = GLX_STENCIL_SIZE; | |
| 105 attribs[i++] = this->gl_config.stencil_size; | |
| 106 } | |
| 107 | |
| 108 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
|
109 attribs[i++] = GLX_ACCUM_RED_SIZE; |
| 0 | 110 attribs[i++] = this->gl_config.accum_red_size; |
| 111 } | |
| 112 | |
| 113 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
|
114 attribs[i++] = GLX_ACCUM_GREEN_SIZE; |
| 0 | 115 attribs[i++] = this->gl_config.accum_green_size; |
| 116 } | |
| 117 | |
| 118 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
|
119 attribs[i++] = GLX_ACCUM_BLUE_SIZE; |
| 0 | 120 attribs[i++] = this->gl_config.accum_blue_size; |
| 121 } | |
| 122 | |
| 123 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
|
124 attribs[i++] = GLX_ACCUM_ALPHA_SIZE; |
| 0 | 125 attribs[i++] = this->gl_config.accum_alpha_size; |
| 126 } | |
| 127 | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
128 if( this->gl_config.stereo ) { |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
129 attribs[i++] = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
130 attribs[i++] = this->gl_config.stereo; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
131 } |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
132 |
|
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
|
133 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
|
134 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
|
135 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
|
136 } |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
137 |
|
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
|
138 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
|
139 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
|
140 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
|
141 } |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
142 |
| 0 | 143 #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */ |
|
1060
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
144 if ( !getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
145 attribs[i++] = GLX_X_VISUAL_TYPE; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
146 attribs[i++] = GLX_DIRECT_COLOR; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
147 } |
| 0 | 148 #endif |
| 149 attribs[i++] = None; | |
| 150 | |
| 151 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 152 SDL_Screen, attribs); | |
| 153 #ifdef GLX_DIRECT_COLOR | |
|
1060
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
154 if( !glx_visualinfo && !getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { /* No DirectColor visual? Try again.. */ |
| 0 | 155 attribs[i-3] = None; |
| 156 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 157 SDL_Screen, attribs); | |
| 158 } | |
| 159 #endif | |
| 160 if( !glx_visualinfo ) { | |
| 161 SDL_SetError( "Couldn't find matching GLX visual"); | |
| 162 return NULL; | |
| 163 } | |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
164 /* |
|
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
165 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
|
166 */ |
| 0 | 167 return glx_visualinfo; |
| 168 #else | |
| 169 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 170 return NULL; | |
| 171 #endif | |
| 172 } | |
| 173 | |
| 174 int X11_GL_CreateWindow(_THIS, int w, int h) | |
| 175 { | |
| 176 int retval; | |
|
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
|
177 #ifdef HAVE_OPENGL_X11 |
| 0 | 178 XSetWindowAttributes attributes; |
| 179 unsigned long mask; | |
| 180 unsigned long black; | |
| 181 | |
| 182 black = (glx_visualinfo->visual == DefaultVisual(SDL_Display, | |
| 183 SDL_Screen)) | |
| 184 ? BlackPixel(SDL_Display, SDL_Screen) : 0; | |
| 185 attributes.background_pixel = black; | |
| 186 attributes.border_pixel = black; | |
| 187 attributes.colormap = SDL_XColorMap; | |
| 188 mask = CWBackPixel | CWBorderPixel | CWColormap; | |
| 189 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
190 SDL_Window = pXCreateWindow(SDL_Display, WMwindow, |
| 0 | 191 0, 0, w, h, 0, glx_visualinfo->depth, |
| 192 InputOutput, glx_visualinfo->visual, | |
| 193 mask, &attributes); | |
| 194 if ( !SDL_Window ) { | |
| 195 SDL_SetError("Could not create window"); | |
| 196 return -1; | |
| 197 } | |
| 198 retval = 0; | |
| 199 #else | |
| 200 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 201 retval = -1; | |
| 202 #endif | |
| 203 return(retval); | |
| 204 } | |
| 205 | |
| 206 int X11_GL_CreateContext(_THIS) | |
| 207 { | |
| 208 int retval; | |
|
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
|
209 #ifdef HAVE_OPENGL_X11 |
| 0 | 210 /* We do this to create a clean separation between X and GLX errors. */ |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
211 pXSync( SDL_Display, False ); |
| 0 | 212 glx_context = this->gl_data->glXCreateContext(GFX_Display, |
| 213 glx_visualinfo, NULL, True); | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
214 pXSync( GFX_Display, False ); |
| 0 | 215 |
| 216 if (glx_context == NULL) { | |
| 217 SDL_SetError("Could not create GL context"); | |
| 218 return -1; | |
| 219 } | |
| 220 | |
| 221 gl_active = 1; | |
| 222 #else | |
| 223 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 224 #endif | |
| 225 if ( gl_active ) { | |
| 226 retval = 0; | |
| 227 } else { | |
| 228 retval = -1; | |
| 229 } | |
| 230 return(retval); | |
| 231 } | |
| 232 | |
| 233 void X11_GL_Shutdown(_THIS) | |
| 234 { | |
|
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
|
235 #ifdef HAVE_OPENGL_X11 |
| 0 | 236 /* Clean up OpenGL */ |
| 237 if( glx_context ) { | |
| 238 this->gl_data->glXMakeCurrent(GFX_Display, None, NULL); | |
| 239 | |
| 240 if (glx_context != NULL) | |
| 241 this->gl_data->glXDestroyContext(GFX_Display, glx_context); | |
| 242 | |
| 243 glx_context = NULL; | |
| 244 } | |
| 245 gl_active = 0; | |
|
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
|
246 #endif /* HAVE_OPENGL_X11 */ |
| 0 | 247 } |
| 248 | |
|
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
|
249 #ifdef HAVE_OPENGL_X11 |
| 0 | 250 |
| 251 /* Make the current context active */ | |
| 252 int X11_GL_MakeCurrent(_THIS) | |
| 253 { | |
| 254 int retval; | |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
255 |
| 0 | 256 retval = 0; |
| 257 if ( ! this->gl_data->glXMakeCurrent(GFX_Display, | |
| 258 SDL_Window, glx_context) ) { | |
| 259 SDL_SetError("Unable to make GL context current"); | |
| 260 retval = -1; | |
| 261 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
262 pXSync( GFX_Display, False ); |
| 0 | 263 |
| 264 /* More Voodoo X server workarounds... Grr... */ | |
| 265 SDL_Lock_EventThread(); | |
| 266 X11_CheckDGAMouse(this); | |
| 267 SDL_Unlock_EventThread(); | |
| 268 | |
| 269 return(retval); | |
| 270 } | |
| 271 | |
| 272 /* Get attribute data from glX. */ | |
| 273 int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value) | |
| 274 { | |
| 275 int retval; | |
| 276 int glx_attrib = None; | |
| 277 | |
| 278 switch( attrib ) { | |
| 279 case SDL_GL_RED_SIZE: | |
| 280 glx_attrib = GLX_RED_SIZE; | |
| 281 break; | |
| 282 case SDL_GL_GREEN_SIZE: | |
| 283 glx_attrib = GLX_GREEN_SIZE; | |
| 284 break; | |
| 285 case SDL_GL_BLUE_SIZE: | |
| 286 glx_attrib = GLX_BLUE_SIZE; | |
| 287 break; | |
| 288 case SDL_GL_ALPHA_SIZE: | |
| 289 glx_attrib = GLX_ALPHA_SIZE; | |
| 290 break; | |
| 291 case SDL_GL_DOUBLEBUFFER: | |
| 292 glx_attrib = GLX_DOUBLEBUFFER; | |
| 293 break; | |
| 294 case SDL_GL_BUFFER_SIZE: | |
| 295 glx_attrib = GLX_BUFFER_SIZE; | |
| 296 break; | |
| 297 case SDL_GL_DEPTH_SIZE: | |
| 298 glx_attrib = GLX_DEPTH_SIZE; | |
| 299 break; | |
| 300 case SDL_GL_STENCIL_SIZE: | |
| 301 glx_attrib = GLX_STENCIL_SIZE; | |
| 302 break; | |
| 303 case SDL_GL_ACCUM_RED_SIZE: | |
| 304 glx_attrib = GLX_ACCUM_RED_SIZE; | |
| 305 break; | |
| 306 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 307 glx_attrib = GLX_ACCUM_GREEN_SIZE; | |
| 308 break; | |
| 309 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 310 glx_attrib = GLX_ACCUM_BLUE_SIZE; | |
| 311 break; | |
| 312 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 313 glx_attrib = GLX_ACCUM_ALPHA_SIZE; | |
| 314 break; | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
315 case SDL_GL_STEREO: |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
316 glx_attrib = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
317 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
|
318 case SDL_GL_MULTISAMPLEBUFFERS: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
319 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
|
320 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
|
321 case SDL_GL_MULTISAMPLESAMPLES: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
322 glx_attrib = GLX_SAMPLES_ARB; |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
323 break; |
| 0 | 324 default: |
| 325 return(-1); | |
| 326 } | |
| 327 | |
| 328 retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value); | |
| 329 | |
| 330 return retval; | |
| 331 } | |
| 332 | |
| 333 void X11_GL_SwapBuffers(_THIS) | |
| 334 { | |
| 335 this->gl_data->glXSwapBuffers(GFX_Display, SDL_Window); | |
| 336 } | |
| 337 | |
|
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
|
338 #endif /* HAVE_OPENGL_X11 */ |
| 0 | 339 |
| 340 void X11_GL_UnloadLibrary(_THIS) | |
| 341 { | |
|
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
|
342 #ifdef HAVE_OPENGL_X11 |
| 0 | 343 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
|
344 |
|
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
|
345 /* !!! FIXME: Can we just use SDL_UnloadObject() everywhere? */ |
|
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
|
346 #ifdef USE_DLOPEN |
| 0 | 347 dlclose(this->gl_config.dll_handle); |
|
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
|
348 #else |
|
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
|
349 SDL_UnloadObject(this->gl_config.dll_handle); |
|
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
|
350 #endif |
| 0 | 351 |
| 352 this->gl_data->glXGetProcAddress = NULL; | |
| 353 this->gl_data->glXChooseVisual = NULL; | |
| 354 this->gl_data->glXCreateContext = NULL; | |
| 355 this->gl_data->glXDestroyContext = NULL; | |
| 356 this->gl_data->glXMakeCurrent = NULL; | |
| 357 this->gl_data->glXSwapBuffers = NULL; | |
| 358 | |
| 359 this->gl_config.dll_handle = NULL; | |
| 360 this->gl_config.driver_loaded = 0; | |
| 361 } | |
| 362 #endif | |
| 363 } | |
| 364 | |
|
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
|
365 #ifdef HAVE_OPENGL_X11 |
| 0 | 366 |
|
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
|
367 static void *do_dlsym(void *handle, const char *name) |
|
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
|
368 { |
|
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
|
369 /* !!! FIXME: Can we just use SDL_LoadFunction() everywhere? */ |
|
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
|
370 #ifdef USE_DLOPEN |
|
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
|
371 return dlsym(handle, name); |
|
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
|
372 #else |
|
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
|
373 return SDL_LoadFunction(handle, name); |
|
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
|
374 #endif |
|
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
|
375 } |
|
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
|
376 |
|
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
|
377 #if defined(__OpenBSD__) && !defined(__ELF__) |
|
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
|
378 #define do_dlsym(x,y) do_dlsym(x, "_" y) |
|
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
|
379 #endif |
|
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
|
380 |
| 0 | 381 /* Passing a NULL path means load pointers from the application */ |
| 382 int X11_GL_LoadLibrary(_THIS, const char* path) | |
| 383 { | |
|
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
|
384 void* handle = NULL; |
| 0 | 385 |
|
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
|
386 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
|
387 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
|
388 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
|
389 } |
|
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
|
390 |
|
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
|
391 if ( path == NULL ) { |
| 0 | 392 path = getenv("SDL_VIDEO_GL_DRIVER"); |
| 393 if ( path == NULL ) { | |
| 394 path = DEFAULT_OPENGL; | |
| 395 } | |
|
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
|
396 } |
|
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
|
397 |
|
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
|
398 /* !!! FIXME: Can we just use SDL_LoadObject() everywhere? */ |
|
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
|
399 #ifdef USE_DLOPEN |
|
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
|
400 { |
|
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
|
401 #ifdef RTLD_GLOBAL |
|
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
|
402 int dlopen_flags = RTLD_LAZY | RTLD_GLOBAL; |
|
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
|
403 #else |
|
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
|
404 int dlopen_flags = RTLD_LAZY; |
|
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
|
405 #endif |
| 0 | 406 handle = dlopen(path, dlopen_flags); |
|
1246
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
407 if ( handle == NULL ) { |
|
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
408 SDL_SetError("Could not load OpenGL library: %s", (const char *) dlerror()); |
|
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
409 return -1; |
|
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
410 } |
| 0 | 411 } |
|
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
|
412 #else |
|
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
|
413 handle = SDL_LoadObject(path); |
|
1246
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
414 if ( handle == NULL ) { |
|
1247
ff73ee89ff4b
Don't trample SDL_LoadObject()'s error message in GL loader.
Ryan C. Gordon <icculus@icculus.org>
parents:
1246
diff
changeset
|
415 /* SDL_LoadObject() will call SDL_SetError() for us. */ |
|
1246
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
416 return -1; |
|
ca51a76a7328
Make error message meaningful if dlopen() fails on libX11.
Ryan C. Gordon <icculus@icculus.org>
parents:
1196
diff
changeset
|
417 } |
|
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
|
418 #endif |
|
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
|
419 |
| 0 | 420 |
| 421 /* Unload the old driver and reset the pointers */ | |
| 422 X11_GL_UnloadLibrary(this); | |
| 423 | |
| 424 /* Load new function pointers */ | |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
425 this->gl_data->glXGetProcAddress = |
|
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
|
426 (void *(*)(const GLubyte *)) do_dlsym(handle, "glXGetProcAddressARB"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
427 this->gl_data->glXChooseVisual = |
|
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
|
428 (XVisualInfo *(*)(Display *, int, int *)) do_dlsym(handle, "glXChooseVisual"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
429 this->gl_data->glXCreateContext = |
|
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
|
430 (GLXContext (*)(Display *, XVisualInfo *, GLXContext, int)) do_dlsym(handle, "glXCreateContext"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
431 this->gl_data->glXDestroyContext = |
|
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
|
432 (void (*)(Display *, GLXContext)) do_dlsym(handle, "glXDestroyContext"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
433 this->gl_data->glXMakeCurrent = |
|
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
|
434 (int (*)(Display *, GLXDrawable, GLXContext)) do_dlsym(handle, "glXMakeCurrent"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
435 this->gl_data->glXSwapBuffers = |
|
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
|
436 (void (*)(Display *, GLXDrawable)) do_dlsym(handle, "glXSwapBuffers"); |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
437 this->gl_data->glXGetConfig = |
|
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
|
438 (int (*)(Display *, XVisualInfo *, int, int *)) do_dlsym(handle, "glXGetConfig"); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
439 this->gl_data->glXQueryExtensionsString = |
|
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
|
440 (const char *(*)(Display *, int)) do_dlsym(handle, "glXQueryExtensionsString"); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
441 |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
442 |
| 0 | 443 if ( (this->gl_data->glXChooseVisual == NULL) || |
| 444 (this->gl_data->glXCreateContext == NULL) || | |
| 445 (this->gl_data->glXDestroyContext == NULL) || | |
| 446 (this->gl_data->glXMakeCurrent == NULL) || | |
| 447 (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
|
448 (this->gl_data->glXGetConfig == NULL) || |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
449 (this->gl_data->glXQueryExtensionsString == NULL)) { |
| 0 | 450 SDL_SetError("Could not retrieve OpenGL functions"); |
| 451 return -1; | |
| 452 } | |
| 453 | |
| 454 this->gl_config.dll_handle = handle; | |
| 455 this->gl_config.driver_loaded = 1; | |
| 456 if ( path ) { | |
| 457 strncpy(this->gl_config.driver_path, path, | |
| 458 sizeof(this->gl_config.driver_path)-1); | |
| 459 } else { | |
| 460 strcpy(this->gl_config.driver_path, ""); | |
| 461 } | |
| 462 return 0; | |
| 463 } | |
| 464 | |
| 465 void *X11_GL_GetProcAddress(_THIS, const char* proc) | |
| 466 { | |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
467 static char procname[1024]; |
| 0 | 468 void* handle; |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
469 void* retval; |
| 0 | 470 |
| 471 handle = this->gl_config.dll_handle; | |
| 472 if ( this->gl_data->glXGetProcAddress ) { | |
|
1196
b81f54c3963f
Fixed compile warnings with gcc 4
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
473 return this->gl_data->glXGetProcAddress((const GLubyte *)proc); |
| 0 | 474 } |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
475 #if defined(__OpenBSD__) && !defined(__ELF__) |
|
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
|
476 #undef do_dlsym |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
477 #endif |
|
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
|
478 retval = do_dlsym(handle, proc); |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
479 if (!retval && strlen(proc) <= 1022) { |
|
127
0bcae11eba14
Oops, that wasn't right...
Sam Lantinga <slouken@libsdl.org>
parents:
110
diff
changeset
|
480 procname[0] = '_'; |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
481 strcpy(procname + 1, proc); |
|
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
|
482 retval = do_dlsym(handle, procname); |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
483 } |
|
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
484 return retval; |
| 0 | 485 } |
| 486 | |
|
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
|
487 #endif /* HAVE_OPENGL_X11 */ |