Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11gl_c.h @ 638:b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
From: Pasi K?rkk?inen
Subject: [PATCH] fix SDL OpenGL segfault with DRI/Mesa drivers and Glew
Hello!
The attached patch fixes a bug in SDL which causes SDL to crash in
X11_GL_Shutdown() if you are using DRI/Mesa drivers AND glew
(http://glew.sf.net).
The bug is caused by a namespace collision affecting dlsym() to fetch wrong
pointer for glXReleaseBuffersMESA() (uninitialized pointer from glew because
the extension is NOT supported by the driver) and then SDL calling it in
X11_GL_Shutdown().
SDL should check if the glXReleaseBuffersMESA() is really supported by the
driver (from the extensions string) before calling it.
Attached patch adds extension string parsing to check if
glXReleaseBuffersMESA() is really supported (and this way
prevents the segfault).
Availability of the extensions should be _always_ checked from the
extensions string rather than using dlsym()!
Please add it to the next version of SDL.
Thanks to gltron and author of glew to help fixing this.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 28 Jun 2003 17:27:33 +0000 |
| parents | f6ffac90895c |
| children | 0f2029a70548 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
297
f6ffac90895c
Updated copyright information for 2002
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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:
110
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #ifdef HAVE_OPENGL | |
| 29 #include <GL/glx.h> | |
| 30 #include <dlfcn.h> | |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
31 #if defined(__OpenBSD__) && !defined(__ELF__) |
|
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
32 #define dlsym(x,y) dlsym(x, "_" y) |
|
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
33 #endif |
| 0 | 34 #endif |
| 35 #include "SDL_sysvideo.h" | |
| 36 | |
| 37 struct SDL_PrivateGLData { | |
| 38 int gl_active; /* to stop switching drivers while we have a valid context */ | |
| 39 | |
| 40 #ifdef HAVE_OPENGL | |
| 41 GLXContext glx_context; /* Current GL context */ | |
| 42 XVisualInfo* glx_visualinfo; /* XVisualInfo* returned by glXChooseVisual */ | |
| 43 | |
| 44 void * (*glXGetProcAddress)(const GLubyte *procName); | |
| 45 | |
| 46 XVisualInfo* (*glXChooseVisual) | |
| 47 ( Display* dpy, | |
| 48 int screen, | |
| 49 int* attribList ); | |
| 50 | |
| 51 GLXContext (*glXCreateContext) | |
| 52 ( Display* dpy, | |
| 53 XVisualInfo* vis, | |
| 54 GLXContext shareList, | |
| 55 Bool direct ); | |
| 56 | |
| 57 void (*glXDestroyContext) | |
| 58 ( Display* dpy, | |
| 59 GLXContext ctx ); | |
| 60 | |
| 61 Bool (*glXMakeCurrent) | |
| 62 ( Display* dpy, | |
| 63 GLXDrawable drawable, | |
| 64 GLXContext ctx ); | |
| 65 | |
| 66 void (*glXSwapBuffers) | |
| 67 ( Display* dpy, | |
| 68 GLXDrawable drawable ); | |
| 69 | |
| 70 int (*glXGetConfig) | |
| 71 ( Display* dpy, | |
| 72 XVisualInfo* visual_info, | |
| 73 int attrib, | |
| 74 int* value ); | |
| 75 | |
| 76 void (*glXReleaseBuffersMESA) | |
| 77 ( Display* dpy, | |
| 78 GLXDrawable drawable ); | |
| 79 | |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
80 const char (*glXQueryExtensionsString) |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
81 ( Display* dpy, |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
82 int screen); |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
83 |
|
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
84 |
| 0 | 85 #endif /* HAVE_OPENGL */ |
| 86 }; | |
| 87 | |
| 88 /* Old variable names */ | |
| 89 #define gl_active (this->gl_data->gl_active) | |
| 90 #define glx_context (this->gl_data->glx_context) | |
| 91 #define glx_visualinfo (this->gl_data->glx_visualinfo) | |
| 92 | |
| 93 /* OpenGL functions */ | |
| 94 extern XVisualInfo *X11_GL_GetVisual(_THIS); | |
| 95 extern int X11_GL_CreateWindow(_THIS, int w, int h); | |
| 96 extern int X11_GL_CreateContext(_THIS); | |
| 97 extern void X11_GL_Shutdown(_THIS); | |
| 98 #ifdef HAVE_OPENGL | |
| 99 extern int X11_GL_MakeCurrent(_THIS); | |
| 100 extern int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value); | |
| 101 extern void X11_GL_SwapBuffers(_THIS); | |
| 102 extern int X11_GL_LoadLibrary(_THIS, const char* path); | |
| 103 extern void *X11_GL_GetProcAddress(_THIS, const char* proc); | |
| 104 #endif | |
| 105 extern void X11_GL_UnloadLibrary(_THIS); | |
| 106 |