Mercurial > sdl-ios-xcode
annotate src/video/fbcon/SDL_fbvideo.h @ 1554:0ca607a5d173
Fixed bug #84
Date: Sun, 23 Oct 2005 16:39:03 +0200
From: "A. Schmid" <sahib@phreaker.net>
Subject: [SDL] no software surfaces with svgalib driver?
Hi,
I noticed that the SDL (1.2.9) svgalib driver only makes use of linear
addressable (framebuffer) video modes. On older systems (like one of
mine), linear addressable modes are often not available.
Especially for cards with VESA VBE < 2.0 the svgalib vesa driver is
unusable, since VESA only supports framebuffering for VBE 2.0 and later.
The changes necessary to add support for software surfaces seem to be
relatively small. I only had to hack src/video/svga/SDL_svgavideo.c (see
attached patch). The code worked fine for me, but it is no more than a
proof of concept and should be reviewed (probably has a memory leak when
switching modes). It also uses the vgagl library (included in the
svgalib package) and needs to be linked against it.
-Alex
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 19 Mar 2006 12:04:40 +0000 |
| parents | d910939febfa |
| children | 14717b52abc0 |
| 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:
1201
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:
1201
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:
1201
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:
1201
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:
1201
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:
1201
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:
1201
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:
106
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #ifndef _SDL_fbvideo_h | |
| 25 #define _SDL_fbvideo_h | |
| 26 | |
| 27 #include <sys/types.h> | |
| 28 #include <termios.h> | |
| 29 #include <linux/fb.h> | |
| 30 | |
| 31 #include "SDL_mouse.h" | |
| 32 #include "SDL_mutex.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
33 #include "../SDL_sysvideo.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
34 #if SDL_INPUT_TSLIB |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
35 #include "tslib.h" |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
36 #endif |
| 0 | 37 |
| 38 /* Hidden "this" pointer for the video functions */ | |
| 39 #define _THIS SDL_VideoDevice *this | |
| 40 | |
| 41 | |
| 42 /* This is the structure we use to keep track of video memory */ | |
| 43 typedef struct vidmem_bucket { | |
| 44 struct vidmem_bucket *prev; | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
45 int used; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
46 int dirty; |
| 0 | 47 char *base; |
| 48 unsigned int size; | |
| 49 struct vidmem_bucket *next; | |
| 50 } vidmem_bucket; | |
| 51 | |
| 52 /* Private display data */ | |
| 53 struct SDL_PrivateVideoData { | |
| 54 int console_fd; | |
| 55 struct fb_var_screeninfo cache_vinfo; | |
| 56 struct fb_var_screeninfo saved_vinfo; | |
| 57 int saved_cmaplen; | |
| 58 __u16 *saved_cmap; | |
| 59 | |
| 60 int current_vt; | |
| 61 int saved_vt; | |
| 62 int keyboard_fd; | |
| 63 int saved_kbd_mode; | |
| 64 struct termios saved_kbd_termios; | |
| 65 | |
| 66 int mouse_fd; | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
67 #if SDL_INPUT_TSLIB |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
68 struct tsdev *ts_dev; |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
69 #endif |
| 0 | 70 |
| 71 char *mapped_mem; | |
| 72 int mapped_memlen; | |
| 73 int mapped_offset; | |
| 74 char *mapped_io; | |
| 75 long mapped_iolen; | |
| 76 int flip_page; | |
| 77 char *flip_address[2]; | |
| 78 | |
| 79 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ | |
| 80 int SDL_nummodes[NUM_MODELISTS]; | |
| 81 SDL_Rect **SDL_modelist[NUM_MODELISTS]; | |
| 82 | |
| 83 vidmem_bucket surfaces; | |
| 84 int surfaces_memtotal; | |
| 85 int surfaces_memleft; | |
| 86 | |
| 87 SDL_mutex *hw_lock; | |
| 88 | |
| 89 void (*wait_vbl)(_THIS); | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
90 void (*wait_idle)(_THIS); |
| 0 | 91 }; |
| 92 /* Old variable names */ | |
| 93 #define console_fd (this->hidden->console_fd) | |
| 94 #define current_vt (this->hidden->current_vt) | |
| 95 #define saved_vt (this->hidden->saved_vt) | |
| 96 #define keyboard_fd (this->hidden->keyboard_fd) | |
| 97 #define saved_kbd_mode (this->hidden->saved_kbd_mode) | |
| 98 #define saved_kbd_termios (this->hidden->saved_kbd_termios) | |
| 99 #define mouse_fd (this->hidden->mouse_fd) | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
100 #if SDL_INPUT_TSLIB |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
101 #define ts_dev (this->hidden->ts_dev) |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
102 #endif |
| 0 | 103 #define cache_vinfo (this->hidden->cache_vinfo) |
| 104 #define saved_vinfo (this->hidden->saved_vinfo) | |
| 105 #define saved_cmaplen (this->hidden->saved_cmaplen) | |
| 106 #define saved_cmap (this->hidden->saved_cmap) | |
| 107 #define mapped_mem (this->hidden->mapped_mem) | |
| 108 #define mapped_memlen (this->hidden->mapped_memlen) | |
| 109 #define mapped_offset (this->hidden->mapped_offset) | |
| 110 #define mapped_io (this->hidden->mapped_io) | |
| 111 #define mapped_iolen (this->hidden->mapped_iolen) | |
| 112 #define flip_page (this->hidden->flip_page) | |
| 113 #define flip_address (this->hidden->flip_address) | |
| 114 #define SDL_nummodes (this->hidden->SDL_nummodes) | |
| 115 #define SDL_modelist (this->hidden->SDL_modelist) | |
| 116 #define surfaces (this->hidden->surfaces) | |
| 117 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | |
| 118 #define surfaces_memleft (this->hidden->surfaces_memleft) | |
| 119 #define hw_lock (this->hidden->hw_lock) | |
| 120 #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
|
121 #define wait_idle (this->hidden->wait_idle) |
| 0 | 122 |
| 123 /* Accelerator types that are supported by the driver, but are not | |
| 124 necessarily in the kernel headers on the system we compile on. | |
| 125 */ | |
| 126 #ifndef FB_ACCEL_MATROX_MGAG400 | |
| 127 #define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */ | |
| 128 #endif | |
| 129 #ifndef FB_ACCEL_3DFX_BANSHEE | |
| 130 #define FB_ACCEL_3DFX_BANSHEE 31 /* 3Dfx Banshee */ | |
| 131 #endif | |
| 132 | |
| 133 /* These functions are defined in SDL_fbvideo.c */ | |
| 134 extern void FB_SavePaletteTo(_THIS, int palette_len, __u16 *area); | |
| 135 extern void FB_RestorePaletteFrom(_THIS, int palette_len, __u16 *area); | |
| 136 | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
137 /* 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
|
138 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
139 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
|
140 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
141 ((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
|
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__ 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
|
145 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
146 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
|
147 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
148 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
149 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
|
150 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
151 vidmem_bucket *bucket; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
152 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
153 /* 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
|
154 wait_idle(this); |
|
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 /* Clear all surface dirty bits */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
157 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
|
158 bucket->dirty = 0; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
159 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
160 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
161 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
162 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
|
163 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
164 *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
|
165 *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
|
166 if ( dst == this->screen ) { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
167 *x += this->offset_x; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
168 *y += this->offset_y; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
169 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
170 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
171 |
| 0 | 172 #endif /* _SDL_fbvideo_h */ |