Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgavideo.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 | b8d311d90021 |
| 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:
105
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #ifndef _SDL_dgavideo_h | |
| 29 #define _SDL_dgavideo_h | |
| 30 | |
| 31 #include <X11/Xlib.h> | |
| 32 | |
| 33 #include "SDL_mouse.h" | |
| 34 #include "SDL_mutex.h" | |
| 35 #include "SDL_sysvideo.h" | |
| 36 | |
| 37 /* Hidden "this" pointer for the video functions */ | |
| 38 #define _THIS SDL_VideoDevice *this | |
| 39 | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
40 /* Define this if you need the DGA driver to be thread-safe */ |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
41 #define LOCK_DGA_DISPLAY |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
42 #ifdef LOCK_DGA_DISPLAY |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
43 #define LOCK_DISPLAY() SDL_mutexP(event_lock) |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
44 #define UNLOCK_DISPLAY() SDL_mutexV(event_lock) |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
45 #else |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
46 #define LOCK_DISPLAY() |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
47 #define UNLOCK_DISPLAY() |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
48 #endif |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
49 |
| 0 | 50 |
| 51 /* This is the structure we use to keep track of video memory */ | |
| 52 typedef struct vidmem_bucket { | |
| 53 struct vidmem_bucket *prev; | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
54 int used; |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
55 int dirty; |
| 0 | 56 Uint8 *base; |
| 57 unsigned int size; | |
| 58 struct vidmem_bucket *next; | |
| 59 } vidmem_bucket; | |
| 60 | |
| 61 /* Private display data */ | |
| 62 struct SDL_PrivateVideoData { | |
| 63 Display *DGA_Display; | |
| 64 Colormap DGA_colormap; | |
| 65 int visualClass; | |
| 66 | |
| 67 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ | |
| 68 int SDL_nummodes[NUM_MODELISTS]; | |
| 69 SDL_Rect **SDL_modelist[NUM_MODELISTS]; | |
| 70 | |
| 71 /* Information for the video surface */ | |
| 72 Uint8 *memory_base; | |
| 73 int memory_pitch; | |
| 74 SDL_mutex *hw_lock; | |
| 75 int sync_needed; | |
| 76 int was_flipped; | |
| 77 | |
| 78 /* Information for hardware surfaces */ | |
| 79 vidmem_bucket surfaces; | |
| 80 int surfaces_memtotal; | |
| 81 int surfaces_memleft; | |
| 82 | |
| 83 /* Information for double-buffering */ | |
| 84 int flip_page; | |
| 85 int flip_yoffset[2]; | |
| 86 Uint8 *flip_address[2]; | |
| 87 | |
| 88 /* Used to handle DGA events */ | |
| 89 int event_base; | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
90 #ifdef LOCK_DGA_DISPLAY |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
91 SDL_mutex *event_lock; |
|
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
92 #endif |
| 0 | 93 }; |
| 94 /* Old variable names */ | |
| 95 #define DGA_Display (this->hidden->DGA_Display) | |
| 96 #define DGA_Screen DefaultScreen(DGA_Display) | |
| 97 #define DGA_colormap (this->hidden->DGA_colormap) | |
| 98 #define DGA_visualClass (this->hidden->visualClass) | |
| 99 #define memory_base (this->hidden->memory_base) | |
| 100 #define memory_pitch (this->hidden->memory_pitch) | |
| 101 #define flip_page (this->hidden->flip_page) | |
| 102 #define flip_yoffset (this->hidden->flip_yoffset) | |
| 103 #define flip_address (this->hidden->flip_address) | |
| 104 #define sync_needed (this->hidden->sync_needed) | |
| 105 #define was_flipped (this->hidden->was_flipped) | |
| 106 #define SDL_nummodes (this->hidden->SDL_nummodes) | |
| 107 #define SDL_modelist (this->hidden->SDL_modelist) | |
| 108 #define surfaces (this->hidden->surfaces) | |
| 109 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | |
| 110 #define surfaces_memleft (this->hidden->surfaces_memleft) | |
| 111 #define hw_lock (this->hidden->hw_lock) | |
| 112 #define DGA_event_base (this->hidden->event_base) | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
113 #define event_lock (this->hidden->event_lock) |
| 0 | 114 |
| 115 #endif /* _SDL_dgavideo_h */ |