Mercurial > sdl-ios-xcode
view src/video/fbcon/SDL_fbvideo.h @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | f7b03b6838cb |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifndef _SDL_fbvideo_h #define _SDL_fbvideo_h #include <sys/types.h> #include <termios.h> #include <linux/fb.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "../SDL_sysvideo.h" #if SDL_INPUT_TSLIB #include "tslib.h" #endif /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* This is the structure we use to keep track of video memory */ typedef struct vidmem_bucket { struct vidmem_bucket *prev; int used; int dirty; char *base; unsigned int size; struct vidmem_bucket *next; } vidmem_bucket; /* Private display data */ struct SDL_PrivateVideoData { int console_fd; struct fb_var_screeninfo cache_vinfo; struct fb_var_screeninfo saved_vinfo; int saved_cmaplen; __u16 *saved_cmap; int current_vt; int saved_vt; int keyboard_fd; int saved_kbd_mode; struct termios saved_kbd_termios; int mouse_fd; #if SDL_INPUT_TSLIB struct tsdev *ts_dev; #endif char *mapped_mem; int mapped_memlen; int mapped_offset; char *mapped_io; long mapped_iolen; int flip_page; char *flip_address[2]; #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; vidmem_bucket surfaces; int surfaces_memtotal; int surfaces_memleft; SDL_mutex *hw_lock; int switched_away; struct fb_var_screeninfo screen_vinfo; Uint32 screen_arealen; Uint8 *screen_contents; __u16 screen_palette[3 * 256]; void (*wait_vbl) (_THIS); void (*wait_idle) (_THIS); }; /* Old variable names */ #define console_fd (this->hidden->console_fd) #define current_vt (this->hidden->current_vt) #define saved_vt (this->hidden->saved_vt) #define keyboard_fd (this->hidden->keyboard_fd) #define saved_kbd_mode (this->hidden->saved_kbd_mode) #define saved_kbd_termios (this->hidden->saved_kbd_termios) #define mouse_fd (this->hidden->mouse_fd) #if SDL_INPUT_TSLIB #define ts_dev (this->hidden->ts_dev) #endif #define cache_vinfo (this->hidden->cache_vinfo) #define saved_vinfo (this->hidden->saved_vinfo) #define saved_cmaplen (this->hidden->saved_cmaplen) #define saved_cmap (this->hidden->saved_cmap) #define mapped_mem (this->hidden->mapped_mem) #define mapped_memlen (this->hidden->mapped_memlen) #define mapped_offset (this->hidden->mapped_offset) #define mapped_io (this->hidden->mapped_io) #define mapped_iolen (this->hidden->mapped_iolen) #define flip_page (this->hidden->flip_page) #define flip_address (this->hidden->flip_address) #define SDL_nummodes (this->hidden->SDL_nummodes) #define SDL_modelist (this->hidden->SDL_modelist) #define surfaces (this->hidden->surfaces) #define surfaces_memtotal (this->hidden->surfaces_memtotal) #define surfaces_memleft (this->hidden->surfaces_memleft) #define hw_lock (this->hidden->hw_lock) #define switched_away (this->hidden->switched_away) #define screen_vinfo (this->hidden->screen_vinfo) #define screen_arealen (this->hidden->screen_arealen) #define screen_contents (this->hidden->screen_contents) #define screen_palette (this->hidden->screen_palette) #define wait_vbl (this->hidden->wait_vbl) #define wait_idle (this->hidden->wait_idle) /* Accelerator types that are supported by the driver, but are not necessarily in the kernel headers on the system we compile on. */ #ifndef FB_ACCEL_MATROX_MGAG400 #define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */ #endif #ifndef FB_ACCEL_3DFX_BANSHEE #define FB_ACCEL_3DFX_BANSHEE 31 /* 3Dfx Banshee */ #endif /* These functions are defined in SDL_fbvideo.c */ extern void FB_SavePaletteTo(_THIS, int palette_len, __u16 * area); extern void FB_RestorePaletteFrom(_THIS, int palette_len, __u16 * area); /* These are utility functions for working with video surfaces */ static __inline__ void FB_AddBusySurface(SDL_Surface * surface) { ((vidmem_bucket *) surface->hwdata)->dirty = 1; } static __inline__ int FB_IsSurfaceBusy(SDL_Surface * surface) { return ((vidmem_bucket *) surface->hwdata)->dirty; } static __inline__ void FB_WaitBusySurfaces(_THIS) { vidmem_bucket *bucket; /* Wait for graphic operations to complete */ wait_idle(this); /* Clear all surface dirty bits */ for (bucket = &surfaces; bucket; bucket = bucket->next) { bucket->dirty = 0; } } static __inline__ void FB_dst_to_xy(_THIS, SDL_Surface * dst, int *x, int *y) { *x = (long) ((char *) dst->pixels - mapped_mem) % this->screen->pitch; *y = (long) ((char *) dst->pixels - mapped_mem) / this->screen->pitch; if (dst == this->screen) { *x += this->offset_x; *y += this->offset_y; } } #endif /* _SDL_fbvideo_h */ /* vi: set ts=4 sw=4 expandtab: */