- Removed changelog notes from osd_sdl.h

- Moved "known bugs" to README_SDL13.txt

This is what has been there:

    - fixed returning (w,h) = (0,0) in get_max_bounds
    - new video driver "sdl13" utilitizing SDL texture and line
      drawing support. Accelerated drivers like directfb now
      may attain opengl speed. DirectFB does with a radeon card.
      The driver determines which pixel formats perform best and
      converts textures to these pixel formats.
      Supported options:
      -waitvsync
      -filter
      -prescale
      Supported renderdrivers:
      X11: opengl, software, x11 (no artwork!)
      DirectFB: directfb, software, opengl (special setup, slow)
      Windows: software, gdi (no artwork)
    - SDL1.3: Clear bck when moving
    - SDL1.3: now compiles on win32
    - SDL1.3: Support screen refresh rates, provided the sdl video
      layer supports them (e.g. X11).
    - Use video_config.waitvsync (previously option was queried)
    - -video soft / -sm  now supports -prescale
    - removed reqwidth, reqheight from sdl_monitor_info; not used anywhere
    - removed layerconfig from sdl_video_config; not used anywhere

    - fixed yuv issues (firefox) / this was a bug I introduced
    - removed deprecat.h from output.c
    - Separated keyboard and mouse initialization into separate functions
    - added _FORTIFY_SOURCE to verbose compiler define output.
    - remove MAX_CPU from debugwin.c
    - fixed vsync handling in SDL1.3 in soft/opengl drivers
    - "waitvsync" also supported by "soft" driver in SDL1.3
    - multiple mice and keyboards supported in SDL1.3
    - support for DISTRO= make option
    - got rid of "-joymap" and "-joymap_file"
    - add -joy_idx[0-7] -keyb_idx[0-7] -mouse_idx[0-7] which
      specify, which device is allocated to to e.g. Mouse 1, Mouse 2, ...
    - moved define of THREAD_COOPERATIVE into sdl.mak and renamed to
      NO_THREAD_COOPERATIVE. Changed references to #ifndef
    - define NO_DEBUGGER in sdl.mak
    - Solaris now uses -DNO_AFFINITY_NP
    - added machine to window_info, removed deprecat.h from drawogl.c

    - For DEBUG=1 builds, disable input grapping while windowed
    - Fixed WIN32 compile
      Wrote setenv function since mingw does not provide one.
      Implemented osd_event_* as inline functions for win32 build.
      We should at some point merge sdlwork.c and winwork.c and push it
      to the core, letting sdlsync.c provide the necessary details.
    - Removed keybled.c and references
    - Added output.c and output.h. These will look for a fifo or file
      /tmp/sdlmame_out and write output notifiers to it.
      Added a sample client ledutil.sh to src/osd/sdl which turns
      leds on and off and provides a debug (log) facility.
    - removed os2work.c

    - replaced window->render_lock with event window->rendered_event
      For multiple windows and "-mt", the old code would allow filling up
      the workqueue with 1000s of entries, since the lock would not block while
      another window is rendered. The osd_event establishes a barrier which
      is only freed if the last window blit operation has finished.
    - Set SDL_VIDEO_GL_DRIVER if -gl_lib is given. The SDL directfb driver is picky about
      this. Added reminder: FIXME: move lib loading code from drawogl.c here. This may be
      used to disable opengl if no library was loaded.
    - SDL1.3/video=opengl: Fixed windows not being updated after another window was resized
    - for -verbose, output some information about renderer (-video soft)
    - initialize mouse_enabled with option "-mouse". Affects both SDL1.2 and SDL1.3
      This will hide the mouse if you specify "-mouse".
    - SDL1.2: added blitmode "async" which sets SDL_ASYNCBLIT
    - SDL1.2: removed blitmodes "hwbest" and "hwblit"
    - added blitmode "hwbest" for antialiased and smoothed scaling now that the
      directfb driver supports it. This is also supported by the 1.3 opengl
      render backend
    - added sdlinput_release_keys to cope with lost keyboard events in SDL1.3
    - some identing in drawogl.c
    - rename SDL_* macros to SDLMAME_* (avoid name clashes)
    - got rid of VIDEO_SCALE_MODE constants. Scale modes are now handled in drawsdl.c.
      Starting mame with eg. -video soft -sm yuy2 on X11 no longer crashes.
    - some more changes to input.c to avoid resize loops (issue for directfb)

    - working ui mouse inputs for SDL1.2 and SDL1.3 incl. yuv modes
    - added blitmode "hwblit" (SDL1.3) for rgb hardware scaling
    - rename "-yuvmode" option to "-scalemode"
    - rename yuv_mode and derivatives to scale_mode
    - moved extra_flags into sdl_info
    - moved callbacks indow sdl_window_info
    - made a number of flags (e.g. yuvmode) window relative
         - changing of yuvmodes and opengl scale effects is working with SDL 1.3
    - improved fullscreen handling
    - removed HAS_WINDOW_MENU - this has no effect nowhere
    - removed underscores in header defines, e.g. __SDL_SYNC__ ==> __SDLSYNC__
    - added SDLMAME_HAS_DEBUGGER define
    - removed #if 0 inw window.c
    - added option "-audiodriver" to specify the SDL audio driver
    - added option "-videodriver" to specify the SDL video driver
    - added option "-renderdriver" to specify the SDL renderer driver
    - changed environment SDLMAME_GL_LIB into option -gl_lib
    - added some more SDL_ENV defines
    - move keymap reading into separate function
    - SDL_EnableUNICODE for all builds (not only MESS)
    - SDL1.3 : Mouse & text input for ui

    - removed  osd_event_wait_multiple from sdlsync.h
    - removed some includes not needed
    - reorganized texcopy/scale2x
    - removed effect.h
    - removed effect_func.h
    - indenting
    - put osd_copyfile, osd_stat into #ifdef MESS
    - added code which implements events without the need
      for pthreads. This is commented out, since
      owever, it horribly fails, if
      threads > num processors as is the case if you
      enable "-mt"
    - rename mame_bitmap to bitmap_t
    - introduced define OSDWORK_CALLBACK to prototype and
      define functions to be passed to sdlwork.c

    - fixes from judge for warnings / may reappear (glade)
    - more warnings fixed / may reappear (glade)
    - moved osdefs.h into sdlprefix.h
    - removed osdefs.h
    - finally removed sdlmisc.h

    - create drawogl.c and moved ogl relevant stuff there
    - draw.window_init() now called after window creation
    - removed window.opengl flag
    - added sdl_window_info as parameter to all functions in window.h
    - rename SDL_VERSIONNUM to SDL_VERSION_ATLEAST
    - removed all uclock stuff in sdlmisc.[ch]
    - minor cleanups

    - fixed compile issues against SDL13
    - fixed input issues with SDL13
    - stricter checks for USE_OPENGL, e.g. for options
    - move sdlvideo_loadgl to window.c, rename it to sdlwindow_loadgl and make it static
    - moved yuv_blit.c into drawsdl.c
    - renamed compute_blit_surface_size to sdlwindow_blit_surface_size
    - renamed drawsdl_destroy_all_textures to drawogl_destroy_all_textures and
      moved it to _sdl_draw_callbacks
    - removed print_colums
    - rename misc.h to sdlmisc.h
    - moved some includes from .h to .c
    - rename led_init to sdlled_init for consistency
    - rename sdl_init_audio to sdlaudio_init for consistency
    - fixed some indentation issues
    - removed ticker.h & dirty.h

    - changed all [f]printf to mame_printf_verbose|error|warning
    - removed obsolete frameskipping code
    - removed obsolete throttle code
    - removed fastforward
    - removed framestorun
    - introduced SDLOPTION constants for a number of options
    - add more verbose info for YUV

    - removed dirty.h
    - removed ticker.h

    - remove win_trying_to_quit
    - changed win_use_mouse to static use_mouse
    - removed win_key_trans_table
    - removed keyboard typematic definitions from input.h
    - made sdl_monitor_list static
    - removed hwstretch (sdl_video_config)
    - removed syncrefresh (sdl_video_config)
    - removed triplebuf (sdl_video_config)
    - removed sdl_has_menu
    - fixed memory_leak (window.c)

    - moved prototypes from drawsdl.c to window.h
    - removed joystick calibration code
    - "#if 0" code which is unreachable
    - "#if 0" code which is never used
    - moved pick_best_mode to window.c
    - removed pause_brightness option
    - added more SDLOPTION_ defines

    - renamed void yuv_lookup_init to drawsdl_yuv_init (global namespace)
    - rmoved some obsolete code
    - add SDL1.3 compatibility

    - fixed some compile issues
    - moved clear_surface into window thread
    - got SDL1.3 -mt working - still crashing on exit

    - removed "digital" option
    - removed device selection options
    - added more SDLOPTION defines
This commit is contained in:
Couriersud 2010-02-12 22:42:31 +00:00
parent 3decc6f78c
commit 377fc28f9b
4 changed files with 119 additions and 234 deletions

View File

@ -5,6 +5,14 @@ Warning
work.
- if you are using wine on unix be sure to disable wintab32.dll
Known bugs:
===========
* SDL1.3/X11: Some compound keys, e.g. "'" are not supported by SDL driver
* SDL1.3: sdlvideofps does not take -numscreens>1 into account.
* SDL1.3/WIN32: crashes with -rd d3d
* SDL1.3/WIN32: resizing does not work
Build SDL 1.3 from SVN
======================

View File

@ -117,6 +117,12 @@ typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuin
#define GL_DEPTH_COMPONENT32 0x81A7
#endif
//#define OLD_CODE 1
#ifndef OLD_CODE
#define HASH_SIZE ((1<<10)+1)
#define OVERFLOW_SIZE (1<<10)
#endif
// OSD headers
#include "osdsdl.h"
@ -163,7 +169,9 @@ typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *t
/* texture_info holds information about a texture */
struct _texture_info
{
#ifdef OLD_CODE
texture_info * next; // next texture in the list
#endif
HashT hash; // hash value for the texture (must be >= pointer size)
UINT32 flags; // rendering flags
render_texinfo texinfo; // copy of the texture info
@ -220,7 +228,11 @@ struct _sdl_info
int initialized; // is everything well initialized, i.e. all GL stuff etc.
// 3D info (GL mode only)
#ifdef OLD_CODE
texture_info * texlist; // list of active textures
#else
texture_info * texhash[HASH_SIZE + OVERFLOW_SIZE];
#endif
int last_blendmode; // previous blendmode
INT32 texture_max_width; // texture maximum width
INT32 texture_max_height; // texture maximum height
@ -283,10 +295,19 @@ static const line_aa_step line_aa_4step[] =
// INLINES
//============================================================
#ifdef OLD_CODE
INLINE HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags)
{
return (HashT)texture->base ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK));
}
#else
INLINE HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags)
{
HashT h = (HashT)texture ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK));
//printf("hash %d\n", (int) h % HASH_SIZE);
return (h >> 8) % HASH_SIZE;
}
#endif
INLINE void set_blendmode(sdl_info *sdl, int blendmode)
{
@ -2539,9 +2560,24 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf
}
// add us to the texture list
#ifdef OLD_CODE
texture->next = sdl->texlist;
sdl->texlist = texture;
#else
if (sdl->texhash[texture->hash] == NULL)
sdl->texhash[texture->hash] = texture;
else
{
int i;
for (i = HASH_SIZE; i < HASH_SIZE + OVERFLOW_SIZE; i++)
if (sdl->texhash[i] == NULL)
{
sdl->texhash[i] = texture;
break;
}
assert(i < HASH_SIZE + OVERFLOW_SIZE);
}
#endif
if(sdl->usevbo)
{
// Generate And Bind The Texture Coordinate Buffer
@ -2668,6 +2704,7 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou
// texture_find
//============================================================
#ifdef OLD_CODE
static texture_info *texture_find(sdl_info *sdl, const render_primitive *prim)
{
HashT texhash = texture_compute_hash(&prim->texture, prim->flags);
@ -2686,6 +2723,55 @@ static texture_info *texture_find(sdl_info *sdl, const render_primitive *prim)
// nothing found
return NULL;
}
#else
#if 0
static int compare_texinfo(render_texinfo *t1, render_texinfo *t2)
{
if (t1->base == t2->base &&
t1->width == t2->width &&
t1->height == t2->height &&
t1->rowpixels == t2->rowpixels)
return 1;
else
return 0;
}
#endif
static int compare_texture_primitive(const texture_info *texture, const render_primitive *prim)
{
if (texture->texinfo.base == prim->texture.base &&
texture->texinfo.width == prim->texture.width &&
texture->texinfo.height == prim->texture.height &&
texture->texinfo.rowpixels == prim->texture.rowpixels &&
((texture->flags ^ prim->flags) & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK)) == 0)
return 1;
else
return 0;
}
static texture_info *texture_find(sdl_info *sdl, const render_primitive *prim)
{
HashT texhash = texture_compute_hash(&prim->texture, prim->flags);
texture_info *texture;
texture = sdl->texhash[texhash];
if (texture != NULL)
{
int i;
if (compare_texture_primitive(texture, prim))
return texture;
for (i=HASH_SIZE; i<HASH_SIZE + OVERFLOW_SIZE; i++)
{
texture = sdl->texhash[i];
if (texture != NULL && compare_texture_primitive(texture, prim))
return texture;
}
}
return NULL;
}
#endif
//============================================================
// texture_update
@ -3027,8 +3113,13 @@ static void texture_all_disable(sdl_info *sdl)
static void drawogl_destroy_all_textures(sdl_window_info *window)
{
sdl_info *sdl = (sdl_info *) window->dxdata;
texture_info *next_texture=NULL, *texture = NULL;
texture_info *texture = NULL;
int lock=FALSE;
#ifdef OLD_CODE
texture_info *next_texture=NULL;
#else
int i;
#endif
if (sdl == NULL)
return;
@ -3046,16 +3137,26 @@ static void drawogl_destroy_all_textures(sdl_window_info *window)
osd_lock_acquire(window->primlist->lock);
}
texture = sdl->texlist;
glFinish();
texture_all_disable(sdl);
glFinish();
glDisableClientState(GL_VERTEX_ARRAY);
#ifdef OLD_CODE
texture = sdl->texlist;
while (texture)
{
next_texture = texture->next;
#else
i=0;
while (i<HASH_SIZE+OVERFLOW_SIZE)
{
texture = sdl->texhash[i];
sdl->texhash[i] = NULL;
if (texture != NULL)
{
#endif
if(sdl->usevbo)
{
@ -3094,10 +3195,15 @@ static void drawogl_destroy_all_textures(sdl_window_info *window)
texture->data_own=FALSE;
}
free(texture);
#ifdef OLD_CODE
texture = next_texture;
}
sdl->texlist = NULL;
#else
}
i++;
}
#endif
if ( sdl->useglsl )
{
glsl_shader_free(sdl->glsl);

View File

@ -1,204 +1,6 @@
#ifndef _osdsdl_h_
#define _osdsdl_h_
/* Notes
- Known bugs:
* SDL1.3/X11: Some compound keys, e.g. "'" are not supported by SDL driver
* SDL1.3: sdlvideofps does not take -numscreens>1 into account.
* SDL1.3/WIN32: crashes with -rd d3d
* SDL1.3/WIN32: resizing does not work
- fixed returning (w,h) = (0,0) in get_max_bounds
- new video driver "sdl13" utilitizing SDL texture and line
drawing support. Accelerated drivers like directfb now
may attain opengl speed. DirectFB does with a radeon card.
The driver determines which pixel formats perform best and
converts textures to these pixel formats.
Supported options:
-waitvsync
-filter
-prescale
Supported renderdrivers:
X11: opengl, software, x11 (no artwork!)
DirectFB: directfb, software, opengl (special setup, slow)
Windows: software, gdi (no artwork)
- SDL1.3: Clear bck when moving
- SDL1.3: now compiles on win32
- SDL1.3: Support screen refresh rates, provided the sdl video
layer supports them (e.g. X11).
- Use video_config.waitvsync (previously option was queried)
- -video soft / -sm now supports -prescale
- removed reqwidth, reqheight from sdl_monitor_info; not used anywhere
- removed layerconfig from sdl_video_config; not used anywhere
- fixed yuv issues (firefox) / this was a bug I introduced
- removed deprecat.h from output.c
- Separated keyboard and mouse initialization into separate functions
- added _FORTIFY_SOURCE to verbose compiler define output.
- remove MAX_CPU from debugwin.c
- fixed vsync handling in SDL1.3 in soft/opengl drivers
- "waitvsync" also supported by "soft" driver in SDL1.3
- multiple mice and keyboards supported in SDL1.3
- support for DISTRO= make option
- got rid of "-joymap" and "-joymap_file"
- add -joy_idx[0-7] -keyb_idx[0-7] -mouse_idx[0-7] which
specify, which device is allocated to to e.g. Mouse 1, Mouse 2, ...
- moved define of THREAD_COOPERATIVE into sdl.mak and renamed to
NO_THREAD_COOPERATIVE. Changed references to #ifndef
- define NO_DEBUGGER in sdl.mak
- Solaris now uses -DNO_AFFINITY_NP
- added machine to window_info, removed deprecat.h from drawogl.c
- For DEBUG=1 builds, disable input grapping while windowed
- Fixed WIN32 compile
Wrote setenv function since mingw does not provide one.
Implemented osd_event_* as inline functions for win32 build.
We should at some point merge sdlwork.c and winwork.c and push it
to the core, letting sdlsync.c provide the necessary details.
- Removed keybled.c and references
- Added output.c and output.h. These will look for a fifo or file
/tmp/sdlmame_out and write output notifiers to it.
Added a sample client ledutil.sh to src/osd/sdl which turns
leds on and off and provides a debug (log) facility.
- removed os2work.c
- replaced window->render_lock with event window->rendered_event
For multiple windows and "-mt", the old code would allow filling up
the workqueue with 1000s of entries, since the lock would not block while
another window is rendered. The osd_event establishes a barrier which
is only freed if the last window blit operation has finished.
- Set SDL_VIDEO_GL_DRIVER if -gl_lib is given. The SDL directfb driver is picky about
this. Added reminder: FIXME: move lib loading code from drawogl.c here. This may be
used to disable opengl if no library was loaded.
- SDL1.3/video=opengl: Fixed windows not being updated after another window was resized
- for -verbose, output some information about renderer (-video soft)
- initialize mouse_enabled with option "-mouse". Affects both SDL1.2 and SDL1.3
This will hide the mouse if you specify "-mouse".
- SDL1.2: added blitmode "async" which sets SDL_ASYNCBLIT
- SDL1.2: removed blitmodes "hwbest" and "hwblit"
- added blitmode "hwbest" for antialiased and smoothed scaling now that the
directfb driver supports it. This is also supported by the 1.3 opengl
render backend
- added sdlinput_release_keys to cope with lost keyboard events in SDL1.3
- some identing in drawogl.c
- rename SDL_* macros to SDLMAME_* (avoid name clashes)
- got rid of VIDEO_SCALE_MODE constants. Scale modes are now handled in drawsdl.c.
Starting mame with eg. -video soft -sm yuy2 on X11 no longer crashes.
- some more changes to input.c to avoid resize loops (issue for directfb)
- working ui mouse inputs for SDL1.2 and SDL1.3 incl. yuv modes
- added blitmode "hwblit" (SDL1.3) for rgb hardware scaling
- rename "-yuvmode" option to "-scalemode"
- rename yuv_mode and derivatives to scale_mode
- moved extra_flags into sdl_info
- moved callbacks indow sdl_window_info
- made a number of flags (e.g. yuvmode) window relative
- changing of yuvmodes and opengl scale effects is working with SDL 1.3
- improved fullscreen handling
- removed HAS_WINDOW_MENU - this has no effect nowhere
- removed underscores in header defines, e.g. __SDL_SYNC__ ==> __SDLSYNC__
- added SDLMAME_HAS_DEBUGGER define
- removed #if 0 inw window.c
- added option "-audiodriver" to specify the SDL audio driver
- added option "-videodriver" to specify the SDL video driver
- added option "-renderdriver" to specify the SDL renderer driver
- changed environment SDLMAME_GL_LIB into option -gl_lib
- added some more SDL_ENV defines
- move keymap reading into separate function
- SDL_EnableUNICODE for all builds (not only MESS)
- SDL1.3 : Mouse & text input for ui
- removed osd_event_wait_multiple from sdlsync.h
- removed some includes not needed
- reorganized texcopy/scale2x
- removed effect.h
- removed effect_func.h
- indenting
- put osd_copyfile, osd_stat into #ifdef MESS
- added code which implements events without the need
for pthreads. This is commented out, since
owever, it horribly fails, if
threads > num processors as is the case if you
enable "-mt"
- rename mame_bitmap to bitmap_t
- introduced define OSDWORK_CALLBACK to prototype and
define functions to be passed to sdlwork.c
- fixes from judge for warnings / may reappear (glade)
- more warnings fixed / may reappear (glade)
- moved osdefs.h into sdlprefix.h
- removed osdefs.h
- finally removed sdlmisc.h
- create drawogl.c and moved ogl relevant stuff there
- draw.window_init() now called after window creation
- removed window.opengl flag
- added sdl_window_info as parameter to all functions in window.h
- rename SDL_VERSIONNUM to SDL_VERSION_ATLEAST
- removed all uclock stuff in sdlmisc.[ch]
- minor cleanups
- fixed compile issues against SDL13
- fixed input issues with SDL13
- stricter checks for USE_OPENGL, e.g. for options
- move sdlvideo_loadgl to window.c, rename it to sdlwindow_loadgl and make it static
- moved yuv_blit.c into drawsdl.c
- renamed compute_blit_surface_size to sdlwindow_blit_surface_size
- renamed drawsdl_destroy_all_textures to drawogl_destroy_all_textures and
moved it to _sdl_draw_callbacks
- removed print_colums
- rename misc.h to sdlmisc.h
- moved some includes from .h to .c
- rename led_init to sdlled_init for consistency
- rename sdl_init_audio to sdlaudio_init for consistency
- fixed some indentation issues
- removed ticker.h & dirty.h
- changed all [f]printf to mame_printf_verbose|error|warning
- removed obsolete frameskipping code
- removed obsolete throttle code
- removed fastforward
- removed framestorun
- introduced SDLOPTION constants for a number of options
- add more verbose info for YUV
- removed dirty.h
- removed ticker.h
- remove win_trying_to_quit
- changed win_use_mouse to static use_mouse
- removed win_key_trans_table
- removed keyboard typematic definitions from input.h
- made sdl_monitor_list static
- removed hwstretch (sdl_video_config)
- removed syncrefresh (sdl_video_config)
- removed triplebuf (sdl_video_config)
- removed sdl_has_menu
- fixed memory_leak (window.c)
- moved prototypes from drawsdl.c to window.h
- removed joystick calibration code
- "#if 0" code which is unreachable
- "#if 0" code which is never used
- moved pick_best_mode to window.c
- removed pause_brightness option
- added more SDLOPTION_ defines
- renamed void yuv_lookup_init to drawsdl_yuv_init (global namespace)
- rmoved some obsolete code
- add SDL1.3 compatibility
- fixed some compile issues
- moved clear_surface into window thread
- got SDL1.3 -mt working - still crashing on exit
- removed "digital" option
- removed device selection options
- added more SDLOPTION defines
*/
//============================================================
// System dependent defines
//============================================================

View File

@ -423,41 +423,10 @@ int osd_is_absolute_path(const char *path)
return result;
}
/* not used anywhere */
#if 0
//============================================================
// osd_mkdir
// MESS - specific code below ....
//============================================================
file_error osd_mkdir(const char *dir)
{
#ifdef SDLMAME_WIN32
if (mkdir(dir) != 0)
#else
if (mkdir(dir, 0666) != 0)
#endif
{
return error_to_file_error(errno);
}
return FILERR_NONE;
}
//============================================================
// osd_rmdir
//============================================================
static file_error osd_rmdir(const char *dir)
{
if (rmdir(dir) != 0)
{
return error_to_file_error(errno);
}
return FILERR_NONE;
}
#endif
// these are MESS specific - DO NOT TOUCH!!@!
#ifdef MESS