Mercurial > sdl-ios-xcode
view src/video/ps3/SDL_ps3video.h @ 4427:eada7e321df6 SDL-1.2
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.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
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. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
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.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:04:13 +0000 |
parents | 3b8ac3d311a2 |
children |
line wrap: on
line source
/* * SDL - Simple DirectMedia Layer * CELL BE Support for PS3 Framebuffer * Copyright (C) 2008, 2009 International Business Machines Corporation * * 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 * * Martin Lowinski <lowinski [at] de [dot] ibm [ibm] com> * Dirk Herrendoerfer <d.herrendoerfer [at] de [dot] ibm [dot] com> * SPE code based on research by: * Rene Becker * Thimo Emmerich */ #include "SDL_config.h" #include "../SDL_sysvideo.h" #include "SDL_mouse.h" #include "SDL_mutex.h" #include "spulibs/spu_common.h" #include <libspe2.h> #include <pthread.h> #include <linux/types.h> #include <linux/fb.h> #include <asm/ps3fb.h> #include <linux/vt.h> #include <termios.h> #ifndef _SDL_ps3video_h #define _SDL_ps3video_h /* Debugging * 0: No debug messages * 1: Video debug messages * 2: SPE debug messages * 3: Memory adresses */ #define DEBUG_LEVEL 0 #ifdef DEBUG_LEVEL #define deprintf( level, fmt, args... ) \ do \ { \ if ( (unsigned)(level) <= DEBUG_LEVEL ) \ { \ fprintf( stdout, fmt, ##args ); \ fflush( stdout ); \ } \ } while ( 0 ) #else #define deprintf( level, fmt, args... ) #endif /* Framebuffer device */ #define PS3_DEV_FB "/dev/fb0" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice * this /* SPU thread data */ typedef struct spu_data { spe_context_ptr_t ctx; pthread_t thread; spe_program_handle_t program; char * program_name; unsigned int booted; unsigned int keepalive; unsigned int entry; int error_code; void * argp; } spu_data_t; /* Private video driver data needed for Cell support */ struct SDL_PrivateVideoData { const char * const fb_dev_name; /* FB-device name */ int fb_dev_fd; /* Descriptor-handle for fb_dev_name */ uint8_t * frame_buffer; /* mmap'd access to fbdev */ /* SPE threading stuff */ spu_data_t * fb_thread_data; spu_data_t * scaler_thread_data; spu_data_t * converter_thread_data; /* screeninfo (from linux/fb.h) */ struct fb_fix_screeninfo fb_finfo; struct fb_var_screeninfo fb_vinfo; struct fb_var_screeninfo fb_orig_vinfo; /* screeninfo (from asm/ps3fb.h) */ struct ps3fb_ioctl_res res; unsigned int double_buffering; uint32_t real_width; // real width of screen uint32_t real_height; // real height of screen uint32_t s_fb_pixel_size; // 32: 4 24: 3 16: 2 15: 2 uint32_t fb_bits_per_pixel; // 32: 32 24: 24 16: 16 15: 15 uint32_t config_count; uint32_t s_input_line_length; // precalculated: input_width * fb_pixel_size uint32_t s_bounded_input_width; // width of input (bounded by writeable width) uint32_t s_bounded_input_height;// height of input (bounded by writeable height) uint32_t s_bounded_input_width_offset; // offset from the left side (used for centering) uint32_t s_bounded_input_height_offset; // offset from the upper side (used for centering) uint32_t s_writeable_width; // width of screen which is writeable uint32_t s_writeable_height; // height of screen which is writeable uint8_t * s_center[2]; // where to begin writing our image (centered?) uint32_t s_center_index; volatile void * s_pixels __attribute__((aligned(128))); /* Framebuffer data */ volatile struct fb_writer_parms_t * fb_parms __attribute__((aligned(128))); }; #define fb_dev_name (this->hidden->fb_dev_name) #define fb_dev_fd (this->hidden->fb_dev_fd) #define frame_buffer (this->hidden->frame_buffer) #define fb_thread_data (this->hidden->fb_thread_data) #define scaler_thread_data (this->hidden->scaler_thread_data) #define converter_thread_data (this->hidden->converter_thread_data) #define fb_parms (this->hidden->fb_parms) #define SDL_nummodes (this->hidden->SDL_nummodes) #define SDL_modelist (this->hidden->SDL_modelist) #define SDL_videomode (this->hidden->SDL_videomode) #define fb_finfo (this->hidden->fb_finfo) #define fb_vinfo (this->hidden->fb_vinfo) #define fb_orig_vinfo (this->hidden->fb_orig_vinfo) #define res (this->hidden->res) #define double_buffering (this->hidden->double_buffering) #define real_width (this->hidden->real_width) #define real_height (this->hidden->real_height) #define s_fb_pixel_size (this->hidden->s_fb_pixel_size) #define fb_bits_per_pixel (this->hidden->fb_bits_per_pixel) #define config_count (this->hidden->config_count) #define s_input_line_length (this->hidden->s_input_line_length) #define s_bounded_input_width (this->hidden->s_bounded_input_width) #define s_bounded_input_height (this->hidden->s_bounded_input_height) #define s_bounded_input_width_offset (this->hidden->s_bounded_input_width_offset) #define s_bounded_input_height_offset (this->hidden->s_bounded_input_height_offset) #define s_writeable_width (this->hidden->s_writeable_width) #define s_writeable_height (this->hidden->s_writeable_height) #define s_center (this->hidden->s_center) #define s_center_index (this->hidden->s_center_index) #define s_pixels (this->hidden->s_pixels) #endif /* _SDL_ps3video_h */