Mercurial > sdl-ios-xcode
annotate src/video/fbcon/SDL_fbvideo.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:
106
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_fbvideo_h | |
| 29 #define _SDL_fbvideo_h | |
| 30 | |
| 31 #include <sys/types.h> | |
| 32 #include <termios.h> | |
| 33 #include <linux/fb.h> | |
| 34 | |
| 35 #include "SDL_mouse.h" | |
| 36 #include "SDL_mutex.h" | |
| 37 #include "SDL_sysvideo.h" | |
| 38 | |
| 39 /* Hidden "this" pointer for the video functions */ | |
| 40 #define _THIS SDL_VideoDevice *this | |
| 41 | |
| 42 | |
| 43 /* This is the structure we use to keep track of video memory */ | |
| 44 typedef struct vidmem_bucket { | |
| 45 struct vidmem_bucket *prev; | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
46 int used; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
47 int dirty; |
| 0 | 48 char *base; |
| 49 unsigned int size; | |
| 50 struct vidmem_bucket *next; | |
| 51 } vidmem_bucket; | |
| 52 | |
| 53 /* Private display data */ | |
| 54 struct SDL_PrivateVideoData { | |
| 55 int console_fd; | |
| 56 struct fb_var_screeninfo cache_vinfo; | |
| 57 struct fb_var_screeninfo saved_vinfo; | |
| 58 int saved_cmaplen; | |
| 59 __u16 *saved_cmap; | |
| 60 | |
| 61 int current_vt; | |
| 62 int saved_vt; | |
| 63 int keyboard_fd; | |
| 64 int saved_kbd_mode; | |
| 65 struct termios saved_kbd_termios; | |
| 66 | |
| 67 int mouse_fd; | |
| 68 | |
| 69 char *mapped_mem; | |
| 70 int mapped_memlen; | |
| 71 int mapped_offset; | |
| 72 char *mapped_io; | |
| 73 long mapped_iolen; | |
| 74 int flip_page; | |
| 75 char *flip_address[2]; | |
| 76 | |
| 77 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ | |
| 78 int SDL_nummodes[NUM_MODELISTS]; | |
| 79 SDL_Rect **SDL_modelist[NUM_MODELISTS]; | |
| 80 | |
| 81 vidmem_bucket surfaces; | |
| 82 int surfaces_memtotal; | |
| 83 int surfaces_memleft; | |
| 84 | |
| 85 SDL_mutex *hw_lock; | |
| 86 | |
| 87 void (*wait_vbl)(_THIS); | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
88 void (*wait_idle)(_THIS); |
| 0 | 89 }; |
| 90 /* Old variable names */ | |
| 91 #define console_fd (this->hidden->console_fd) | |
| 92 #define current_vt (this->hidden->current_vt) | |
| 93 #define saved_vt (this->hidden->saved_vt) | |
| 94 #define keyboard_fd (this->hidden->keyboard_fd) | |
| 95 #define saved_kbd_mode (this->hidden->saved_kbd_mode) | |
| 96 #define saved_kbd_termios (this->hidden->saved_kbd_termios) | |
| 97 #define mouse_fd (this->hidden->mouse_fd) | |
| 98 #define cache_vinfo (this->hidden->cache_vinfo) | |
| 99 #define saved_vinfo (this->hidden->saved_vinfo) | |
| 100 #define saved_cmaplen (this->hidden->saved_cmaplen) | |
| 101 #define saved_cmap (this->hidden->saved_cmap) | |
| 102 #define mapped_mem (this->hidden->mapped_mem) | |
| 103 #define mapped_memlen (this->hidden->mapped_memlen) | |
| 104 #define mapped_offset (this->hidden->mapped_offset) | |
| 105 #define mapped_io (this->hidden->mapped_io) | |
| 106 #define mapped_iolen (this->hidden->mapped_iolen) | |
| 107 #define flip_page (this->hidden->flip_page) | |
| 108 #define flip_address (this->hidden->flip_address) | |
| 109 #define SDL_nummodes (this->hidden->SDL_nummodes) | |
| 110 #define SDL_modelist (this->hidden->SDL_modelist) | |
| 111 #define surfaces (this->hidden->surfaces) | |
| 112 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | |
| 113 #define surfaces_memleft (this->hidden->surfaces_memleft) | |
| 114 #define hw_lock (this->hidden->hw_lock) | |
| 115 #define wait_vbl (this->hidden->wait_vbl) | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
116 #define wait_idle (this->hidden->wait_idle) |
| 0 | 117 |
| 118 /* Accelerator types that are supported by the driver, but are not | |
| 119 necessarily in the kernel headers on the system we compile on. | |
| 120 */ | |
| 121 #ifndef FB_ACCEL_MATROX_MGAG400 | |
| 122 #define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */ | |
| 123 #endif | |
| 124 #ifndef FB_ACCEL_3DFX_BANSHEE | |
| 125 #define FB_ACCEL_3DFX_BANSHEE 31 /* 3Dfx Banshee */ | |
| 126 #endif | |
| 127 | |
| 128 /* These functions are defined in SDL_fbvideo.c */ | |
| 129 extern void FB_SavePaletteTo(_THIS, int palette_len, __u16 *area); | |
| 130 extern void FB_RestorePaletteFrom(_THIS, int palette_len, __u16 *area); | |
| 131 | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
132 /* These are utility functions for working with video surfaces */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
133 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
134 static __inline__ void FB_AddBusySurface(SDL_Surface *surface) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
135 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
136 ((vidmem_bucket *)surface->hwdata)->dirty = 1; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
137 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
138 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
139 static __inline__ int FB_IsSurfaceBusy(SDL_Surface *surface) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
140 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
141 return ((vidmem_bucket *)surface->hwdata)->dirty; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
142 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
143 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
144 static __inline__ void FB_WaitBusySurfaces(_THIS) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
145 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
146 vidmem_bucket *bucket; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
147 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
148 /* Wait for graphic operations to complete */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
149 wait_idle(this); |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
150 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
151 /* Clear all surface dirty bits */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
152 for ( bucket=&surfaces; bucket; bucket=bucket->next ) { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
153 bucket->dirty = 0; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
154 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
155 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
156 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
157 static __inline__ void FB_dst_to_xy(_THIS, SDL_Surface *dst, int *x, int *y) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
158 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
159 *x = (long)((char *)dst->pixels - mapped_mem)%this->screen->pitch; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
160 *y = (long)((char *)dst->pixels - mapped_mem)/this->screen->pitch; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
161 if ( dst == this->screen ) { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
162 *x += this->offset_x; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
163 *y += this->offset_y; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
164 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
165 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
166 |
| 0 | 167 #endif /* _SDL_fbvideo_h */ |