X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_sdl.c;h=5e11cf8434aaeaf10a34bb8aafe96cce4f275e3e;hp=b5d1c86cfdfeb12d7f3c8a474c61ab18b0fcd613;hb=215ff9e69c0b845f24e7a3aa9faeef06d9276145;hpb=cc56203b76e1fcef2c7e55b460daf07e654a1547 diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index b5d1c86c..5e11cf84 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2011,2012 + * (C) Gražvydas "notaz" Ignotas, 2011-2013 * * This work is licensed under the terms of any of these licenses * (at your option): @@ -14,7 +14,12 @@ #include "libpicofe/input.h" #include "libpicofe/in_sdl.h" #include "libpicofe/menu.h" +#include "libpicofe/fonts.h" +#include "libpicofe/plat_sdl.h" +#include "libpicofe/gl.h" +#include "cspace.h" #include "plugin_lib.h" +#include "plugin.h" #include "main.h" #include "plat.h" #include "revision.h" @@ -35,87 +40,230 @@ static const struct in_default_bind in_sdl_defbinds[] = { { SDLK_e, IN_BINDTYPE_PLAYER12, DKEY_L2 }, { SDLK_t, IN_BINDTYPE_PLAYER12, DKEY_R2 }, { SDLK_ESCAPE, IN_BINDTYPE_EMU, SACTION_ENTER_MENU }, + { SDLK_F1, IN_BINDTYPE_EMU, SACTION_SAVE_STATE }, + { SDLK_F2, IN_BINDTYPE_EMU, SACTION_LOAD_STATE }, + { SDLK_F3, IN_BINDTYPE_EMU, SACTION_PREV_SSLOT }, + { SDLK_F4, IN_BINDTYPE_EMU, SACTION_NEXT_SSLOT }, + { SDLK_F5, IN_BINDTYPE_EMU, SACTION_TOGGLE_FSKIP }, + { SDLK_F6, IN_BINDTYPE_EMU, SACTION_SCREENSHOT }, + { SDLK_F7, IN_BINDTYPE_EMU, SACTION_TOGGLE_FPS }, + { SDLK_F8, IN_BINDTYPE_EMU, SACTION_SWITCH_DISPMODE }, + { SDLK_F11, IN_BINDTYPE_EMU, SACTION_TOGGLE_FULLSCREEN }, + { SDLK_BACKSPACE, IN_BINDTYPE_EMU, SACTION_FAST_FORWARD }, { 0, 0, 0 } }; -static SDL_Surface *screen; -static void *menubg_img; +const struct menu_keymap in_sdl_key_map[] = +{ + { SDLK_UP, PBTN_UP }, + { SDLK_DOWN, PBTN_DOWN }, + { SDLK_LEFT, PBTN_LEFT }, + { SDLK_RIGHT, PBTN_RIGHT }, + { SDLK_RETURN, PBTN_MOK }, + { SDLK_ESCAPE, PBTN_MBACK }, + { SDLK_SEMICOLON, PBTN_MA2 }, + { SDLK_QUOTE, PBTN_MA3 }, + { SDLK_LEFTBRACKET, PBTN_L }, + { SDLK_RIGHTBRACKET, PBTN_R }, +}; -static int change_video_mode(int w, int h) +const struct menu_keymap in_sdl_joy_map[] = { - screen = SDL_SetVideoMode(w, h, 16, 0); - if (screen == NULL) { - fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError()); - return -1; + { SDLK_UP, PBTN_UP }, + { SDLK_DOWN, PBTN_DOWN }, + { SDLK_LEFT, PBTN_LEFT }, + { SDLK_RIGHT, PBTN_RIGHT }, + /* joystick */ + { SDLK_WORLD_0, PBTN_MOK }, + { SDLK_WORLD_1, PBTN_MBACK }, + { SDLK_WORLD_2, PBTN_MA2 }, + { SDLK_WORLD_3, PBTN_MA3 }, +}; + +static const struct in_pdata in_sdl_platform_data = { + .defbinds = in_sdl_defbinds, + .key_map = in_sdl_key_map, + .kmap_size = sizeof(in_sdl_key_map) / sizeof(in_sdl_key_map[0]), + .joy_map = in_sdl_joy_map, + .jmap_size = sizeof(in_sdl_joy_map) / sizeof(in_sdl_joy_map[0]), +}; + +static int psx_w, psx_h; +static void *shadow_fb, *menubg_img; +static int in_menu; + +static int change_video_mode(int force) +{ + int w, h; + + if (in_menu) { + w = g_menuscreen_w; + h = g_menuscreen_h; + } + else { + w = psx_w; + h = psx_h; } - return 0; + return plat_sdl_change_video_mode(w, h, force); +} + +static void resize_cb(int w, int h) +{ + // used by some plugins.. + pl_rearmed_cbs.screen_w = w; + pl_rearmed_cbs.screen_h = h; + pl_rearmed_cbs.gles_display = gl_es_display; + pl_rearmed_cbs.gles_surface = gl_es_surface; + plugin_call_rearmed_cbs(); +} + +static void quit_cb(void) +{ + emu_core_ask_exit(); +} + +static void get_layer_pos(int *x, int *y, int *w, int *h) +{ + // always fill entire SDL window + *x = *y = 0; + *w = pl_rearmed_cbs.screen_w; + *h = pl_rearmed_cbs.screen_h; } void plat_init(void) { + int shadow_size; int ret; - ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); - if (ret != 0) { - fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError()); - exit(1); - } + plat_sdl_quit_cb = quit_cb; + plat_sdl_resize_cb = resize_cb; - g_menuscreen_w = 640; - g_menuscreen_h = 480; - ret = change_video_mode(g_menuscreen_w, g_menuscreen_h); - if (ret != 0) { - ret = change_video_mode(0, 0); - if (ret != 0) - goto fail; + ret = plat_sdl_init(); + if (ret != 0) + exit(1); - if (screen->w < 320 || screen->h < 240) { - fprintf(stderr, "resolution %dx%d is too small, sorry.\n", - screen->w, screen->h); - goto fail; - } - g_menuscreen_w = screen->w; - g_menuscreen_h = screen->h; - } + in_menu = 1; SDL_WM_SetCaption("PCSX-ReARMed " REV, NULL); - menubg_img = malloc(640 * 512 * 2); - if (menubg_img == NULL) - goto fail; + shadow_size = g_menuscreen_w * g_menuscreen_h * 2; + if (shadow_size < 640 * 512 * 2) + shadow_size = 640 * 512 * 2; + + shadow_fb = malloc(shadow_size); + menubg_img = malloc(shadow_size); + if (shadow_fb == NULL || menubg_img == NULL) { + fprintf(stderr, "OOM\n"); + exit(1); + } - in_sdl_init(in_sdl_defbinds); + in_sdl_init(&in_sdl_platform_data, plat_sdl_event_handler); in_probe(); pl_rearmed_cbs.only_16bpp = 1; - return; + pl_rearmed_cbs.pl_get_layer_pos = get_layer_pos; -fail: - SDL_Quit(); - exit(1); + bgr_to_uyvy_init(); } void plat_finish(void) { + free(shadow_fb); + shadow_fb = NULL; free(menubg_img); menubg_img = NULL; - SDL_Quit(); + plat_sdl_finish(); } void plat_gvideo_open(int is_pal) { } +static void uyvy_to_rgb565(void *d, const void *s, int pixels) +{ + unsigned short *dst = d; + const unsigned int *src = s; + int v; + + // no colors, for now + for (; pixels > 0; src++, dst += 2, pixels -= 2) { + v = (*src >> 8) & 0xff; + v = (v - 16) * 255 / 219 / 8; + dst[0] = (v << 11) | (v << 6) | v; + + v = (*src >> 24) & 0xff; + v = (v - 16) * 255 / 219 / 8; + dst[1] = (v << 11) | (v << 6) | v; + } +} + +static void overlay_blit(int doffs, const void *src_, int w, int h, + int sstride, int bgr24) +{ + const unsigned short *src = src_; + unsigned short *dst; + int dstride = plat_sdl_overlay->w; + + SDL_LockYUVOverlay(plat_sdl_overlay); + dst = (void *)plat_sdl_overlay->pixels[0]; + + dst += doffs; + if (bgr24) { + for (; h > 0; dst += dstride, src += sstride, h--) + bgr888_to_uyvy(dst, src, w); + } + else { + for (; h > 0; dst += dstride, src += sstride, h--) + bgr555_to_uyvy(dst, src, w); + } + + SDL_UnlockYUVOverlay(plat_sdl_overlay); +} + +static void overlay_hud_print(int x, int y, const char *str, int bpp) +{ + SDL_LockYUVOverlay(plat_sdl_overlay); + basic_text_out_uyvy_nf(plat_sdl_overlay->pixels[0], plat_sdl_overlay->w, x, y, str); + SDL_UnlockYUVOverlay(plat_sdl_overlay); +} + void *plat_gvideo_set_mode(int *w, int *h, int *bpp) { - change_video_mode(*w, *h); - return screen->pixels; + psx_w = *w; + psx_h = *h; + change_video_mode(0); + if (plat_sdl_overlay != NULL) { + pl_plat_clear = plat_sdl_overlay_clear; + pl_plat_blit = overlay_blit; + pl_plat_hud_print = overlay_hud_print; + return NULL; + } + else { + pl_plat_clear = NULL; + pl_plat_blit = NULL; + pl_plat_hud_print = NULL; + if (plat_sdl_gl_active) + return shadow_fb; + else + return plat_sdl_screen->pixels; + } } -/* XXX: missing SDL_LockSurface() */ void *plat_gvideo_flip(void) { - SDL_Flip(screen); - return screen->pixels; + if (plat_sdl_overlay != NULL) { + SDL_Rect dstrect = { 0, 0, plat_sdl_screen->w, plat_sdl_screen->h }; + SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect); + return NULL; + } + else if (plat_sdl_gl_active) { + gl_flip(shadow_fb, psx_w, psx_h); + return shadow_fb; + } + else { + // XXX: no locking, but should be fine with SDL_SWSURFACE? + SDL_Flip(plat_sdl_screen); + return plat_sdl_screen->pixels; + } } void plat_gvideo_close(void) @@ -124,28 +272,62 @@ void plat_gvideo_close(void) void plat_video_menu_enter(int is_rom_loaded) { + int force_mode_change = 0; + + in_menu = 1; + /* surface will be lost, must adjust pl_vout_buf for menu bg */ - memcpy(menubg_img, screen->pixels, screen->w * screen->h * 2); + if (plat_sdl_overlay != NULL) + uyvy_to_rgb565(menubg_img, plat_sdl_overlay->pixels[0], psx_w * psx_h); + else if (plat_sdl_gl_active) + memcpy(menubg_img, shadow_fb, psx_w * psx_h * 2); + else + memcpy(menubg_img, plat_sdl_screen->pixels, psx_w * psx_h * 2); pl_vout_buf = menubg_img; - change_video_mode(g_menuscreen_w, g_menuscreen_h); + /* gles plugin messes stuff up.. */ + if (pl_rearmed_cbs.gpu_caps & GPU_CAP_OWNS_DISPLAY) + force_mode_change = 1; + + change_video_mode(force_mode_change); } void plat_video_menu_begin(void) { - SDL_LockSurface(screen); - g_menuscreen_ptr = screen->pixels; + if (plat_sdl_overlay != NULL || plat_sdl_gl_active) { + g_menuscreen_ptr = shadow_fb; + } + else { + SDL_LockSurface(plat_sdl_screen); + g_menuscreen_ptr = plat_sdl_screen->pixels; + } } void plat_video_menu_end(void) { - SDL_UnlockSurface(screen); - SDL_Flip(screen); + if (plat_sdl_overlay != NULL) { + SDL_Rect dstrect = { 0, 0, plat_sdl_screen->w, plat_sdl_screen->h }; + + SDL_LockYUVOverlay(plat_sdl_overlay); + rgb565_to_uyvy(plat_sdl_overlay->pixels[0], shadow_fb, + g_menuscreen_w * g_menuscreen_h); + SDL_UnlockYUVOverlay(plat_sdl_overlay); + + SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect); + } + else if (plat_sdl_gl_active) { + gl_flip(g_menuscreen_ptr, g_menuscreen_w, g_menuscreen_h); + } + else { + SDL_UnlockSurface(plat_sdl_screen); + SDL_Flip(plat_sdl_screen); + } g_menuscreen_ptr = NULL; } void plat_video_menu_leave(void) { + in_menu = 0; } /* unused stuff */ @@ -154,26 +336,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp) return 0; } -int plat_cpu_clock_get(void) -{ - return -1; -} - -int plat_cpu_clock_apply(int cpu_clock) -{ - return -1; -} - -int plat_get_bat_capacity(void) -{ - return -1; -} - -void plat_step_volume(int is_up) -{ -} - -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { }