Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11gl.c @ 1192:54aa9aa32327
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Fri, 18 Nov 2005 23:39:02 +0100
Subject: [SDL] Mouse position bugs on Mac OS X
The attached patch fixes a few bugs in SDL related to the mouse position
in windowed mode on Mac OS X, reproduced using the attached minimal test
program - at least here on 10.3.9, with SDL CVS from today. Could anyone
test whether the bugs exist and are fixed by the patch on 10.2 and 10.4?
1. When using OpenGL, the vertical mouse positions obtained through
events or SDL_GetMouseState() are off by one.
2. When using OpenGL, SDL_WarpMouse() inverts the y coordinate.
3. Clicks on the topmost pixel row of the window are not recognized.
1 and 2 do not occur in non-OpenGL mode, while 3 does. All three only
occur in windowed mode, not in fullscreen.
The cause for 1 and 3 is that in Cocoa, "the location of the mouse"
seems to be defined as "the location of the top left corner of the mouse
pointer's hot pixel" (this is not documented, it's just what I found out
here), which together with the fact that Cocoa's usual y coordinates
start at the bottom and increase upwards means that the y coordinate of
the mouse runs from 1 to h, not from 0 to h-1, in a window of height h.
If it does work on 10.2 and 10.4 (I'll try to test it as soon as I can,
but at the moment all I have at hand is 10.3.9), can this be applied to
the CVS?
-Christian
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Mon, 28 Nov 2005 10:41:51 +0100
Subject: [SDL] Re: Mouse position bugs on Mac OS X
I wrote:
> I'll try to test it as soon as I can, but at the moment all I have at hand is 10.3.9
So, here are the results of my tests (with patched and unpatched
frameworks compiled with Xcode 1.5 (gcc 3.3) on 10.3.9):
On 10.1.5, my test program doesn't run because of "Undefined symbols:
SDL undefined reference to _CGMainDisplayID expected to be defined in
Carbon". I guess not supporting 10.1 was a deliberate decision then and
that's OK with me.
On 10.2.8, 10.3.9, and 10.4.0, the bugs exist as described in my
original post and are fixed by my patch. That is, there is no difference
between pre/post 10.3 and the patched version works correctly in all
combinations of GL/non-GL and windowed/fullscreen.
I therefore recommend the patch for inclusion.
-Christian
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 28 Nov 2005 13:58:26 +0000 |
| parents | 2bd4cec0de63 |
| children | b81f54c3963f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
667
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 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 | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 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 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #include <stdlib.h> /* For getenv() prototype */ | |
| 29 #include <string.h> | |
| 30 | |
| 31 #include "SDL_events_c.h" | |
| 32 #include "SDL_error.h" | |
| 33 #include "SDL_x11video.h" | |
| 34 #include "SDL_x11dga_c.h" | |
| 35 #include "SDL_x11gl_c.h" | |
| 36 | |
|
862
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
37 #if defined(sgi) |
|
f7a8b0ca2ae3
IRIX doesn't have a GL library versioning system
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
38 /* 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
|
39 #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
|
40 #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
|
41 #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
|
42 #else |
| 0 | 43 #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
|
44 #endif |
| 0 | 45 |
|
667
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
46 #ifndef GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
47 #define GLX_ARB_multisample |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
48 #define GLX_SAMPLE_BUFFERS_ARB 100000 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
49 #define GLX_SAMPLES_ARB 100001 |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
50 #endif |
|
adbed8d7a991
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
51 |
| 0 | 52 /* return the preferred visual to use for openGL graphics */ |
| 53 XVisualInfo *X11_GL_GetVisual(_THIS) | |
| 54 { | |
|
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
|
55 #ifdef HAVE_OPENGL_X11 |
| 0 | 56 /* 64 seems nice. */ |
| 57 int attribs[64]; | |
| 58 int i; | |
| 59 | |
| 60 /* load the gl driver from a default path */ | |
| 61 if ( ! this->gl_config.driver_loaded ) { | |
| 62 /* no driver has been loaded, use default (ourselves) */ | |
| 63 if ( X11_GL_LoadLibrary(this, NULL) < 0 ) { | |
| 64 return NULL; | |
| 65 } | |
| 66 } | |
| 67 | |
| 68 /* See if we already have a window which we must use */ | |
| 69 if ( SDL_windowid ) { | |
| 70 XWindowAttributes a; | |
| 71 XVisualInfo vi_in; | |
| 72 int out_count; | |
| 73 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
74 pXGetWindowAttributes(SDL_Display, SDL_Window, &a); |
| 0 | 75 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
|
76 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
|
77 glx_visualinfo = pXGetVisualInfo(SDL_Display, |
| 0 | 78 VisualScreenMask|VisualIDMask, &vi_in, &out_count); |
| 79 return glx_visualinfo; | |
| 80 } | |
| 81 | |
| 82 /* 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
|
83 i = 0; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
84 attribs[i++] = GLX_RGBA; |
| 0 | 85 attribs[i++] = GLX_RED_SIZE; |
| 86 attribs[i++] = this->gl_config.red_size; | |
| 87 attribs[i++] = GLX_GREEN_SIZE; | |
| 88 attribs[i++] = this->gl_config.green_size; | |
| 89 attribs[i++] = GLX_BLUE_SIZE; | |
| 90 attribs[i++] = this->gl_config.blue_size; | |
| 91 | |
| 92 if( this->gl_config.alpha_size ) { | |
| 93 attribs[i++] = GLX_ALPHA_SIZE; | |
| 94 attribs[i++] = this->gl_config.alpha_size; | |
| 95 } | |
| 96 | |
| 97 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
|
98 attribs[i++] = GLX_BUFFER_SIZE; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
99 attribs[i++] = this->gl_config.buffer_size; |
| 0 | 100 } |
| 101 | |
| 102 if( this->gl_config.double_buffer ) { | |
| 103 attribs[i++] = GLX_DOUBLEBUFFER; | |
| 104 } | |
| 105 | |
| 106 attribs[i++] = GLX_DEPTH_SIZE; | |
| 107 attribs[i++] = this->gl_config.depth_size; | |
| 108 | |
| 109 if( this->gl_config.stencil_size ) { | |
| 110 attribs[i++] = GLX_STENCIL_SIZE; | |
| 111 attribs[i++] = this->gl_config.stencil_size; | |
| 112 } | |
| 113 | |
| 114 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
|
115 attribs[i++] = GLX_ACCUM_RED_SIZE; |
| 0 | 116 attribs[i++] = this->gl_config.accum_red_size; |
| 117 } | |
| 118 | |
| 119 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
|
120 attribs[i++] = GLX_ACCUM_GREEN_SIZE; |
| 0 | 121 attribs[i++] = this->gl_config.accum_green_size; |
| 122 } | |
| 123 | |
| 124 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
|
125 attribs[i++] = GLX_ACCUM_BLUE_SIZE; |
| 0 | 126 attribs[i++] = this->gl_config.accum_blue_size; |
| 127 } | |
| 128 | |
| 129 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
|
130 attribs[i++] = GLX_ACCUM_ALPHA_SIZE; |
| 0 | 131 attribs[i++] = this->gl_config.accum_alpha_size; |
| 132 } | |
| 133 | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
134 if( this->gl_config.stereo ) { |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
135 attribs[i++] = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
136 attribs[i++] = this->gl_config.stereo; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
137 } |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
138 |
|
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
|
139 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
|
140 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
|
141 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
|
142 } |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
143 |
|
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
|
144 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
|
145 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
|
146 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
|
147 } |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
148 |
| 0 | 149 #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
|
150 if ( !getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
151 attribs[i++] = GLX_X_VISUAL_TYPE; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
152 attribs[i++] = GLX_DIRECT_COLOR; |
|
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
153 } |
| 0 | 154 #endif |
| 155 attribs[i++] = None; | |
| 156 | |
| 157 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 158 SDL_Screen, attribs); | |
| 159 #ifdef GLX_DIRECT_COLOR | |
|
1060
86885b40a53b
Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
Sam Lantinga <slouken@libsdl.org>
parents:
862
diff
changeset
|
160 if( !glx_visualinfo && !getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { /* No DirectColor visual? Try again.. */ |
| 0 | 161 attribs[i-3] = None; |
| 162 glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, | |
| 163 SDL_Screen, attribs); | |
| 164 } | |
| 165 #endif | |
| 166 if( !glx_visualinfo ) { | |
| 167 SDL_SetError( "Couldn't find matching GLX visual"); | |
| 168 return NULL; | |
| 169 } | |
| 170 return glx_visualinfo; | |
| 171 #else | |
| 172 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 173 return NULL; | |
| 174 #endif | |
| 175 } | |
| 176 | |
| 177 int X11_GL_CreateWindow(_THIS, int w, int h) | |
| 178 { | |
| 179 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
|
180 #ifdef HAVE_OPENGL_X11 |
| 0 | 181 XSetWindowAttributes attributes; |
| 182 unsigned long mask; | |
| 183 unsigned long black; | |
| 184 | |
| 185 black = (glx_visualinfo->visual == DefaultVisual(SDL_Display, | |
| 186 SDL_Screen)) | |
| 187 ? BlackPixel(SDL_Display, SDL_Screen) : 0; | |
| 188 attributes.background_pixel = black; | |
| 189 attributes.border_pixel = black; | |
| 190 attributes.colormap = SDL_XColorMap; | |
| 191 mask = CWBackPixel | CWBorderPixel | CWColormap; | |
| 192 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
193 SDL_Window = pXCreateWindow(SDL_Display, WMwindow, |
| 0 | 194 0, 0, w, h, 0, glx_visualinfo->depth, |
| 195 InputOutput, glx_visualinfo->visual, | |
| 196 mask, &attributes); | |
| 197 if ( !SDL_Window ) { | |
| 198 SDL_SetError("Could not create window"); | |
| 199 return -1; | |
| 200 } | |
| 201 retval = 0; | |
| 202 #else | |
| 203 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 204 retval = -1; | |
| 205 #endif | |
| 206 return(retval); | |
| 207 } | |
| 208 | |
| 209 int X11_GL_CreateContext(_THIS) | |
| 210 { | |
| 211 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
|
212 #ifdef HAVE_OPENGL_X11 |
| 0 | 213 /* 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
|
214 pXSync( SDL_Display, False ); |
| 0 | 215 glx_context = this->gl_data->glXCreateContext(GFX_Display, |
| 216 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
|
217 pXSync( GFX_Display, False ); |
| 0 | 218 |
| 219 if (glx_context == NULL) { | |
| 220 SDL_SetError("Could not create GL context"); | |
| 221 return -1; | |
| 222 } | |
| 223 | |
| 224 gl_active = 1; | |
| 225 #else | |
| 226 SDL_SetError("X11 driver not configured with OpenGL"); | |
| 227 #endif | |
| 228 if ( gl_active ) { | |
| 229 retval = 0; | |
| 230 } else { | |
| 231 retval = -1; | |
| 232 } | |
| 233 return(retval); | |
| 234 } | |
| 235 | |
| 236 void X11_GL_Shutdown(_THIS) | |
| 237 { | |
|
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
|
238 #ifdef HAVE_OPENGL_X11 |
| 0 | 239 /* Clean up OpenGL */ |
| 240 if( glx_context ) { | |
| 241 this->gl_data->glXMakeCurrent(GFX_Display, None, NULL); | |
| 242 | |
| 243 if (glx_context != NULL) | |
| 244 this->gl_data->glXDestroyContext(GFX_Display, glx_context); | |
| 245 | |
| 246 if( this->gl_data->glXReleaseBuffersMESA ) { | |
| 247 this->gl_data->glXReleaseBuffersMESA(GFX_Display,SDL_Window); | |
| 248 } | |
| 249 glx_context = NULL; | |
| 250 } | |
| 251 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
|
252 #endif /* HAVE_OPENGL_X11 */ |
| 0 | 253 } |
| 254 | |
|
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
|
255 #ifdef HAVE_OPENGL_X11 |
| 0 | 256 |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
257 static int ExtensionSupported(const char *extension) |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
258 { |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
259 const GLubyte *extensions = NULL; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
260 const GLubyte *start; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
261 GLubyte *where, *terminator; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
262 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
263 /* Extension names should not have spaces. */ |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
264 where = (GLubyte *) strchr(extension, ' '); |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
265 if (where || *extension == '\0') |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
266 return 0; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
267 |
|
643
564716cfb502
Removed direct dependency on OpenGL (call current_video->glGetString() instead
Ryan C. Gordon <icculus@icculus.org>
parents:
638
diff
changeset
|
268 extensions = current_video->glGetString(GL_EXTENSIONS); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
269 /* It takes a bit of care to be fool-proof about parsing the |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
270 * OpenGL extensions string. Don't be fooled by sub-strings, |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
271 * etc. */ |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
272 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
273 start = extensions; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
274 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
275 for (;;) |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
276 { |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
277 where = (GLubyte *) strstr((const char *) start, extension); |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
278 if (!where) break; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
279 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
280 terminator = where + strlen(extension); |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
281 if (where == start || *(where - 1) == ' ') |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
282 if (*terminator == ' ' || *terminator == '\0') return 1; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
283 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
284 start = terminator; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
285 } |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
286 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
287 return 0; |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
288 } |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
289 |
| 0 | 290 /* Make the current context active */ |
| 291 int X11_GL_MakeCurrent(_THIS) | |
| 292 { | |
| 293 int retval; | |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
294 |
| 0 | 295 retval = 0; |
| 296 if ( ! this->gl_data->glXMakeCurrent(GFX_Display, | |
| 297 SDL_Window, glx_context) ) { | |
| 298 SDL_SetError("Unable to make GL context current"); | |
| 299 retval = -1; | |
| 300 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
1060
diff
changeset
|
301 pXSync( GFX_Display, False ); |
| 0 | 302 |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
303 /* |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
304 * The context is now current, check for glXReleaseBuffersMESA() |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
305 * extension. If extension is _not_ supported, destroy the pointer |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
306 * (to make sure it will not be called in X11_GL_Shutdown() ). |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
307 * |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
308 * DRI/Mesa drivers include glXReleaseBuffersMESA() in the libGL.so, |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
309 * but there's no need to call it (is is only needed for some old |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
310 * non-DRI drivers). |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
311 * |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
312 * When using for example glew (http://glew.sf.net), dlsym() for |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
313 * glXReleaseBuffersMESA() returns the pointer from the glew library |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
314 * (namespace conflict). |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
315 * |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
316 * The glXReleaseBuffersMESA() pointer in the glew is NULL, if the |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
317 * driver doesn't support this extension. So blindly calling it will |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
318 * cause segfault with DRI/Mesa drivers! |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
319 * |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
320 */ |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
321 |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
322 if ( ! ExtensionSupported("glXReleaseBuffersMESA") ) { |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
323 this->gl_data->glXReleaseBuffersMESA = NULL; |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
324 } |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
325 |
| 0 | 326 /* More Voodoo X server workarounds... Grr... */ |
| 327 SDL_Lock_EventThread(); | |
| 328 X11_CheckDGAMouse(this); | |
| 329 SDL_Unlock_EventThread(); | |
| 330 | |
| 331 return(retval); | |
| 332 } | |
| 333 | |
| 334 /* Get attribute data from glX. */ | |
| 335 int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value) | |
| 336 { | |
| 337 int retval; | |
| 338 int glx_attrib = None; | |
| 339 | |
| 340 switch( attrib ) { | |
| 341 case SDL_GL_RED_SIZE: | |
| 342 glx_attrib = GLX_RED_SIZE; | |
| 343 break; | |
| 344 case SDL_GL_GREEN_SIZE: | |
| 345 glx_attrib = GLX_GREEN_SIZE; | |
| 346 break; | |
| 347 case SDL_GL_BLUE_SIZE: | |
| 348 glx_attrib = GLX_BLUE_SIZE; | |
| 349 break; | |
| 350 case SDL_GL_ALPHA_SIZE: | |
| 351 glx_attrib = GLX_ALPHA_SIZE; | |
| 352 break; | |
| 353 case SDL_GL_DOUBLEBUFFER: | |
| 354 glx_attrib = GLX_DOUBLEBUFFER; | |
| 355 break; | |
| 356 case SDL_GL_BUFFER_SIZE: | |
| 357 glx_attrib = GLX_BUFFER_SIZE; | |
| 358 break; | |
| 359 case SDL_GL_DEPTH_SIZE: | |
| 360 glx_attrib = GLX_DEPTH_SIZE; | |
| 361 break; | |
| 362 case SDL_GL_STENCIL_SIZE: | |
| 363 glx_attrib = GLX_STENCIL_SIZE; | |
| 364 break; | |
| 365 case SDL_GL_ACCUM_RED_SIZE: | |
| 366 glx_attrib = GLX_ACCUM_RED_SIZE; | |
| 367 break; | |
| 368 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 369 glx_attrib = GLX_ACCUM_GREEN_SIZE; | |
| 370 break; | |
| 371 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 372 glx_attrib = GLX_ACCUM_BLUE_SIZE; | |
| 373 break; | |
| 374 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 375 glx_attrib = GLX_ACCUM_ALPHA_SIZE; | |
| 376 break; | |
|
450
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
377 case SDL_GL_STEREO: |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
378 glx_attrib = GLX_STEREO; |
|
8a43e0cbf02f
Added SDL_GL_STEREO for stereoscopic OpenGL contexts
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
379 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
|
380 case SDL_GL_MULTISAMPLEBUFFERS: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
381 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
|
382 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
|
383 case SDL_GL_MULTISAMPLESAMPLES: |
|
655
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
384 glx_attrib = GLX_SAMPLES_ARB; |
|
9c42ee1b7d77
Date: Thu, 24 Apr 2003 15:13:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
646
diff
changeset
|
385 break; |
| 0 | 386 default: |
| 387 return(-1); | |
| 388 } | |
| 389 | |
| 390 retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value); | |
| 391 | |
| 392 return retval; | |
| 393 } | |
| 394 | |
| 395 void X11_GL_SwapBuffers(_THIS) | |
| 396 { | |
| 397 this->gl_data->glXSwapBuffers(GFX_Display, SDL_Window); | |
| 398 } | |
| 399 | |
|
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
|
400 #endif /* HAVE_OPENGL_X11 */ |
| 0 | 401 |
| 402 void X11_GL_UnloadLibrary(_THIS) | |
| 403 { | |
|
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
|
404 #ifdef HAVE_OPENGL_X11 |
| 0 | 405 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
|
406 |
|
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
|
407 /* !!! 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
|
408 #ifdef USE_DLOPEN |
| 0 | 409 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
|
410 #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
|
411 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
|
412 #endif |
| 0 | 413 |
| 414 this->gl_data->glXGetProcAddress = NULL; | |
| 415 this->gl_data->glXChooseVisual = NULL; | |
| 416 this->gl_data->glXCreateContext = NULL; | |
| 417 this->gl_data->glXDestroyContext = NULL; | |
| 418 this->gl_data->glXMakeCurrent = NULL; | |
| 419 this->gl_data->glXSwapBuffers = NULL; | |
| 420 | |
| 421 this->gl_config.dll_handle = NULL; | |
| 422 this->gl_config.driver_loaded = 0; | |
| 423 } | |
| 424 #endif | |
| 425 } | |
| 426 | |
|
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
|
427 #ifdef HAVE_OPENGL_X11 |
| 0 | 428 |
|
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
|
429 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
|
430 { |
|
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
|
431 /* !!! 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
|
432 #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
|
433 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
|
434 #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
|
435 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
|
436 #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
|
437 } |
|
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 |
|
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
|
439 #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
|
440 #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
|
441 #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
|
442 |
| 0 | 443 /* Passing a NULL path means load pointers from the application */ |
| 444 int X11_GL_LoadLibrary(_THIS, const char* path) | |
| 445 { | |
|
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
|
446 void* handle = NULL; |
| 0 | 447 |
|
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
|
448 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
|
449 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
|
450 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
|
451 } |
|
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
|
452 |
|
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
|
453 if ( path == NULL ) { |
| 0 | 454 path = getenv("SDL_VIDEO_GL_DRIVER"); |
| 455 if ( path == NULL ) { | |
| 456 path = DEFAULT_OPENGL; | |
| 457 } | |
|
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
|
458 } |
|
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
|
459 |
|
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
|
460 /* !!! 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
|
461 #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
|
462 { |
|
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
|
463 #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
|
464 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
|
465 #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
|
466 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
|
467 #endif |
| 0 | 468 handle = dlopen(path, dlopen_flags); |
| 469 } | |
|
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
|
470 #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
|
471 handle = SDL_LoadObject(path); |
|
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
|
472 #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
|
473 |
| 0 | 474 if ( handle == NULL ) { |
| 475 SDL_SetError("Could not load OpenGL library"); | |
| 476 return -1; | |
| 477 } | |
| 478 | |
| 479 /* Unload the old driver and reset the pointers */ | |
| 480 X11_GL_UnloadLibrary(this); | |
| 481 | |
| 482 /* Load new function pointers */ | |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
483 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
|
484 (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
|
485 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
|
486 (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
|
487 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
|
488 (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
|
489 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
|
490 (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
|
491 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
|
492 (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
|
493 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
|
494 (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
|
495 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
|
496 (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
|
497 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
|
498 (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
|
499 |
| 0 | 500 /* We don't compare below for this in case we're not using Mesa. */ |
|
180
578815880307
Do proper typecasting so this compiles on IRIX
Sam Lantinga <slouken@libsdl.org>
parents:
127
diff
changeset
|
501 this->gl_data->glXReleaseBuffersMESA = |
|
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
|
502 (void (*)(Display *, GLXDrawable)) do_dlsym( handle, "glXReleaseBuffersMESA" ); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
503 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
504 |
| 0 | 505 if ( (this->gl_data->glXChooseVisual == NULL) || |
| 506 (this->gl_data->glXCreateContext == NULL) || | |
| 507 (this->gl_data->glXDestroyContext == NULL) || | |
| 508 (this->gl_data->glXMakeCurrent == NULL) || | |
| 509 (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
|
510 (this->gl_data->glXGetConfig == NULL) || |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
566
diff
changeset
|
511 (this->gl_data->glXQueryExtensionsString == NULL)) { |
| 0 | 512 SDL_SetError("Could not retrieve OpenGL functions"); |
| 513 return -1; | |
| 514 } | |
| 515 | |
| 516 this->gl_config.dll_handle = handle; | |
| 517 this->gl_config.driver_loaded = 1; | |
| 518 if ( path ) { | |
| 519 strncpy(this->gl_config.driver_path, path, | |
| 520 sizeof(this->gl_config.driver_path)-1); | |
| 521 } else { | |
| 522 strcpy(this->gl_config.driver_path, ""); | |
| 523 } | |
| 524 return 0; | |
| 525 } | |
| 526 | |
| 527 void *X11_GL_GetProcAddress(_THIS, const char* proc) | |
| 528 { | |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
529 static char procname[1024]; |
| 0 | 530 void* handle; |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
531 void* retval; |
| 0 | 532 |
| 533 handle = this->gl_config.dll_handle; | |
| 534 if ( this->gl_data->glXGetProcAddress ) { | |
|
566
d6e7d7006062
Enable the glXGetProcAddressARB code (fixes problems with NVidia drivers)
Sam Lantinga <slouken@libsdl.org>
parents:
450
diff
changeset
|
535 return this->gl_data->glXGetProcAddress(proc); |
| 0 | 536 } |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
537 #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
|
538 #undef do_dlsym |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
539 #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
|
540 retval = do_dlsym(handle, proc); |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
541 if (!retval && strlen(proc) <= 1022) { |
|
127
0bcae11eba14
Oops, that wasn't right...
Sam Lantinga <slouken@libsdl.org>
parents:
110
diff
changeset
|
542 procname[0] = '_'; |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
543 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
|
544 retval = do_dlsym(handle, procname); |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
545 } |
|
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
29
diff
changeset
|
546 return retval; |
| 0 | 547 } |
| 548 | |
|
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
|
549 #endif /* HAVE_OPENGL_X11 */ |