Mercurial > sdl-ios-xcode
comparison src/video/fbcon/SDL_fbvideo.h @ 1659:14717b52abc0 SDL-1.3
Merge trunk-1.3-3
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 17 May 2006 08:18:28 +0000 |
parents | d910939febfa |
children | 782fd950bd46 c121d94672cb a1b03ba2fcd0 |
comparison
equal
deleted
inserted
replaced
1658:e49147870aac | 1659:14717b52abc0 |
---|---|
83 vidmem_bucket surfaces; | 83 vidmem_bucket surfaces; |
84 int surfaces_memtotal; | 84 int surfaces_memtotal; |
85 int surfaces_memleft; | 85 int surfaces_memleft; |
86 | 86 |
87 SDL_mutex *hw_lock; | 87 SDL_mutex *hw_lock; |
88 int switched_away; | |
89 struct fb_var_screeninfo screen_vinfo; | |
90 Uint32 screen_arealen; | |
91 Uint8 *screen_contents; | |
92 __u16 screen_palette[3*256]; | |
88 | 93 |
89 void (*wait_vbl)(_THIS); | 94 void (*wait_vbl)(_THIS); |
90 void (*wait_idle)(_THIS); | 95 void (*wait_idle)(_THIS); |
91 }; | 96 }; |
92 /* Old variable names */ | 97 /* Old variable names */ |
115 #define SDL_modelist (this->hidden->SDL_modelist) | 120 #define SDL_modelist (this->hidden->SDL_modelist) |
116 #define surfaces (this->hidden->surfaces) | 121 #define surfaces (this->hidden->surfaces) |
117 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | 122 #define surfaces_memtotal (this->hidden->surfaces_memtotal) |
118 #define surfaces_memleft (this->hidden->surfaces_memleft) | 123 #define surfaces_memleft (this->hidden->surfaces_memleft) |
119 #define hw_lock (this->hidden->hw_lock) | 124 #define hw_lock (this->hidden->hw_lock) |
125 #define switched_away (this->hidden->switched_away) | |
126 #define screen_vinfo (this->hidden->screen_vinfo) | |
127 #define screen_arealen (this->hidden->screen_arealen) | |
128 #define screen_contents (this->hidden->screen_contents) | |
129 #define screen_palette (this->hidden->screen_palette) | |
120 #define wait_vbl (this->hidden->wait_vbl) | 130 #define wait_vbl (this->hidden->wait_vbl) |
121 #define wait_idle (this->hidden->wait_idle) | 131 #define wait_idle (this->hidden->wait_idle) |
122 | 132 |
123 /* Accelerator types that are supported by the driver, but are not | 133 /* Accelerator types that are supported by the driver, but are not |
124 necessarily in the kernel headers on the system we compile on. | 134 necessarily in the kernel headers on the system we compile on. |