diff options
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/osdcomm.h | 4 | ||||
| -rw-r--r-- | src/osd/osdcore.h | 2 | ||||
| -rw-r--r-- | src/osd/sdl/blit13.h | 4 | ||||
| -rw-r--r-- | src/osd/sdl/drawogl.c | 1 | ||||
| -rw-r--r-- | src/osd/sdl/gl_shader_mgr.c | 12 | ||||
| -rw-r--r-- | src/osd/sdl/window.c | 4 |
6 files changed, 13 insertions, 14 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index f87c863b16b..fc0d7d05d5c 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -113,9 +113,9 @@ __extension__ typedef signed long long INT64; /* pointer-sized values */ #ifdef PTR64 -typedef UINT64 FPTR; +typedef UINT64 FPTR; #else -typedef UINT32 FPTR; +typedef UINT32 FPTR; #endif diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index 89aae9c1744..f5b9756120a 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -848,7 +848,7 @@ char *osd_get_clipboard_text(void); an allocated pointer to an osd_directory_entry representing info on the path; even if the file does not exist. - free with osd_free() + free with osd_free() -----------------------------------------------------------------------------*/ osd_directory_entry *osd_stat(const char *path); diff --git a/src/osd/sdl/blit13.h b/src/osd/sdl/blit13.h index 56cebafdb0c..e415a81dbd0 100644 --- a/src/osd/sdl/blit13.h +++ b/src/osd/sdl/blit13.h @@ -54,8 +54,8 @@ INLINE UINT32 pixel_ycc_to_rgb_pal(UINT16 *pixel, const rgb_t *palette) #define OP_RGB32PAL_ARGB32(_src) \ (texsource->palette[0x200 + (((_src) >> 16) & 0xff) ] | \ - texsource->palette[0x100 + (((_src) >> 8) & 0xff) ] | \ - texsource->palette[((_src) & 0xff) ] | 0xff000000) + texsource->palette[0x100 + (((_src) >> 8) & 0xff) ] | \ + texsource->palette[((_src) & 0xff) ] | 0xff000000) #define OP_PAL16_ARGB32(_src) (0xff000000 | texsource->palette[_src]) diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c index c3ad0966b68..22a92b56cfb 100644 --- a/src/osd/sdl/drawogl.c +++ b/src/osd/sdl/drawogl.c @@ -3091,4 +3091,3 @@ static void drawogl_window_clear(sdl_window_info *window) //FIXME: Handled in drawogl_window_draw as well sdl->blittimer = 3; } - diff --git a/src/osd/sdl/gl_shader_mgr.c b/src/osd/sdl/gl_shader_mgr.c index 7aa162973ae..1222c6def67 100644 --- a/src/osd/sdl/gl_shader_mgr.c +++ b/src/osd/sdl/gl_shader_mgr.c @@ -68,8 +68,8 @@ static int glsl_mamebm_fsh2vsh[GLSL_SHADER_FEAT_MAX_NUMBER] = }; static GLhandleARB glsl_mamebm_vsh_shader[GLSL_VERTEX_SHADER_MAX_NUMBER+9] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* general, custom0-9 */ static GLhandleARB glsl_mamebm_fsh_shader [GLSL_SHADER_FEAT_MAX_NUMBER+9] = @@ -83,13 +83,13 @@ static GLhandleARB glsl_scrn_programs [10] = }; static GLhandleARB glsl_scrn_vsh_shader[10] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* custom0-9 */ static GLhandleARB glsl_scrn_fsh_shader [10] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* rgb32: custom0-9 */ const char * glsl_shader_get_filter_name_mamebm(int glslShaderFeature) diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c index dad813d92f1..e4c2054ba3d 100644 --- a/src/osd/sdl/window.c +++ b/src/osd/sdl/window.c @@ -620,14 +620,14 @@ static void sdlwindow_update_cursor_state(running_machine &machine, sdl_window_i SDL_ShowCursor(SDL_ENABLE); if (SDL_GetWindowGrab(window->sdl_window )) SDL_SetWindowGrab(window->sdl_window, SDL_FALSE); - SDL_SetRelativeMouseMode(SDL_FALSE); + SDL_SetRelativeMouseMode(SDL_FALSE); } else { SDL_ShowCursor(SDL_DISABLE); if (!SDL_GetWindowGrab(window->sdl_window)) SDL_SetWindowGrab(window->sdl_window, SDL_TRUE); - SDL_SetRelativeMouseMode(SDL_TRUE); + SDL_SetRelativeMouseMode(SDL_TRUE); } SDL_SetCursor(NULL); // Force an update in case the underlying driver has changed visibility } |
