From cc56203b76e1fcef2c7e55b460daf07e654a1547 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 5 Nov 2012 00:28:57 +0200 Subject: switch over to libpicofe - libretro should not be affected by this, all others need to do 'git submodule init && git submodule update' from now on. - pandora should get gamma control support --- frontend/plat_sdl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 08afd70..b5d1c86 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -10,9 +10,10 @@ #include #include -#include "common/input.h" -#include "common/in_sdl.h" -#include "common/menu.h" + +#include "libpicofe/input.h" +#include "libpicofe/in_sdl.h" +#include "libpicofe/menu.h" #include "plugin_lib.h" #include "main.h" #include "plat.h" -- cgit v1.2.3 From 456f1b86b44a631e7c58e42ae72ce07970843944 Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 6 Nov 2012 02:36:42 +0200 Subject: frontend: add fast forward support --- frontend/plat_sdl.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index b5d1c86..61f904d 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -35,6 +35,14 @@ 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_FAST_FORWARD }, + { SDLK_F8, IN_BINDTYPE_EMU, SACTION_SWITCH_DISPMODE }, { 0, 0, 0 } }; -- cgit v1.2.3 From dde7da71ec95f2d83a9427bd381448438aa9201c Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 11 Nov 2012 21:18:41 +0200 Subject: frontend: add toggle FPS option --- frontend/plat_sdl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 61f904d..1a1ceec 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -41,8 +41,9 @@ static const struct in_default_bind in_sdl_defbinds[] = { { 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_FAST_FORWARD }, + { SDLK_F7, IN_BINDTYPE_EMU, SACTION_TOGGLE_FPS }, { SDLK_F8, IN_BINDTYPE_EMU, SACTION_SWITCH_DISPMODE }, + { SDLK_BACKSPACE, IN_BINDTYPE_EMU, SACTION_FAST_FORWARD }, { 0, 0, 0 } }; -- cgit v1.2.3 From a83762012066e4799394f63d08a161a45f982ab6 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 17 Nov 2012 02:09:49 +0200 Subject: frontend: initial sdl overlay implementation --- frontend/plat_sdl.c | 184 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 155 insertions(+), 29 deletions(-) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 1a1ceec..a899c15 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -16,6 +16,7 @@ #include "libpicofe/menu.h" #include "plugin_lib.h" #include "main.h" +#include "menu.h" #include "plat.h" #include "revision.h" @@ -43,27 +44,101 @@ static const struct in_default_bind in_sdl_defbinds[] = { { 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 } }; +// XXX: maybe determine this instead.. +#define WM_DECORATION_H 32 + static SDL_Surface *screen; +static SDL_Overlay *overlay; +static int window_w, window_h; +static int fs_w, fs_h; +static int psx_w, psx_h; static void *menubg_img; +static int in_menu, pending_resize, old_fullscreen; static int change_video_mode(int w, int h) { - screen = SDL_SetVideoMode(w, h, 16, 0); - if (screen == NULL) { - fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError()); - return -1; + psx_w = w; + psx_h = h; + + if (overlay != NULL) { + SDL_FreeYUVOverlay(overlay); + overlay = NULL; + } + + if (g_use_overlay && !in_menu) { + Uint32 flags = SDL_RESIZABLE; + int win_w = window_w; + int win_h = window_h; + + if (g_fullscreen) { + flags |= SDL_FULLSCREEN; + win_w = fs_w; + win_h = fs_h; + } + + screen = SDL_SetVideoMode(win_w, win_h, 0, flags); + if (screen == NULL) { + fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError()); + return -1; + } + + overlay = SDL_CreateYUVOverlay(w, h, SDL_UYVY_OVERLAY, screen); + if (overlay != NULL) { + /*printf("overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n", + overlay->format, overlay->planes, *overlay->pitches, + overlay->hw_overlay);*/ + + if ((long)overlay->pixels[0] & 3) + fprintf(stderr, "warning: overlay pointer is unaligned\n"); + if (!overlay->hw_overlay) + fprintf(stderr, "warning: video overlay is not hardware accelerated," + " you may want to disable it.\n"); + } + else { + fprintf(stderr, "warning: could not create overlay.\n"); + } } + if (overlay == NULL) { + screen = SDL_SetVideoMode(w, h, 16, 0); + if (screen == NULL) { + fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError()); + return -1; + } + + if (!in_menu) { + window_w = screen->w; + window_h = screen->h; + } + } + + old_fullscreen = g_fullscreen; return 0; } +static void event_handler(void *event_) +{ + SDL_Event *event = event_; + + if (event->type == SDL_VIDEORESIZE) { + //printf("%dx%d\n", event->resize.w, event->resize.h); + if (overlay != NULL && !g_fullscreen && !old_fullscreen) { + window_w = event->resize.w; + window_h = event->resize.h; + pending_resize = 1; + } + } +} + void plat_init(void) { - int ret; + const SDL_VideoInfo *info; + int ret, h; ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); if (ret != 0) { @@ -71,8 +146,25 @@ void plat_init(void) exit(1); } + info = SDL_GetVideoInfo(); + if (info != NULL) { + fs_w = info->current_w; + fs_h = info->current_h; + } + + in_menu = 1; g_menuscreen_w = 640; + if (fs_w != 0 && g_menuscreen_w > fs_w) + g_menuscreen_w = fs_w; g_menuscreen_h = 480; + if (fs_h != 0) { + h = fs_h; + if (info && info->wm_available && h > WM_DECORATION_H) + h -= WM_DECORATION_H; + if (g_menuscreen_h > h) + g_menuscreen_h = h; + } + ret = change_video_mode(g_menuscreen_w, g_menuscreen_h); if (ret != 0) { ret = change_video_mode(0, 0); @@ -84,16 +176,17 @@ void plat_init(void) screen->w, screen->h); goto fail; } - g_menuscreen_w = screen->w; - g_menuscreen_h = screen->h; } + g_menuscreen_w = window_w = screen->w; + g_menuscreen_h = window_h = screen->h; + SDL_WM_SetCaption("PCSX-ReARMed " REV, NULL); menubg_img = malloc(640 * 512 * 2); if (menubg_img == NULL) goto fail; - in_sdl_init(in_sdl_defbinds); + in_sdl_init(in_sdl_defbinds, event_handler); in_probe(); pl_rearmed_cbs.only_16bpp = 1; return; @@ -120,10 +213,58 @@ void *plat_gvideo_set_mode(int *w, int *h, int *bpp) return screen->pixels; } +static void test_convert(void *d, const void *s, int pixels) +{ + unsigned int *dst = d; + const unsigned short *src = s; + int r0, g0, b0, r1, g1, b1; + int y0, y1, u, v; + + for (; pixels > 0; src += 2, dst++, pixels -= 2) { + r0 = src[0] >> 11; + g0 = (src[0] >> 6) & 0x1f; + b0 = src[0] & 0x1f; + r1 = src[1] >> 11; + g1 = (src[1] >> 6) & 0x1f; + b1 = src[1] & 0x1f; + y0 = (int)((0.299f * r0) + (0.587f * g0) + (0.114f * b0)); + y1 = (int)((0.299f * r1) + (0.587f * g1) + (0.114f * b1)); + //u = (int)(((-0.169f * r0) + (-0.331f * g0) + ( 0.499f * b0)) * 8) + 128; + //v = (int)((( 0.499f * r0) + (-0.418f * g0) + (-0.0813f * b0)) * 8) + 128; + u = (int)(8 * 0.565f * (b0 - y0)) + 128; + v = (int)(8 * 0.713f * (r0 - y0)) + 128; + // valid Y range seems to be 16..235 + y0 = 16 + 219 * y0 / 31; + y1 = 16 + 219 * y1 / 31; + + if (y0 < 0 || y0 > 255 || y1 < 0 || y1 > 255 + || u < 0 || u > 255 || v < 0 || v > 255) + { + printf("oor: %d, %d, %d, %d\n", y0, y1, u, v); + } + *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u; + } +} + /* XXX: missing SDL_LockSurface() */ void *plat_gvideo_flip(void) { - SDL_Flip(screen); + if (!in_menu && overlay != NULL) { + SDL_Rect dstrect = { 0, 0, screen->w, screen->h }; + SDL_LockYUVOverlay(overlay); + test_convert(overlay->pixels[0], screen->pixels, overlay->w * overlay->h); + SDL_UnlockYUVOverlay(overlay); + SDL_DisplayYUVOverlay(overlay, &dstrect); + } + else + SDL_Flip(screen); + + if (pending_resize || g_fullscreen != old_fullscreen) { + // must be done here so that correct buffer is returned + change_video_mode(psx_w, psx_h); + pending_resize = 0; + } + return screen->pixels; } @@ -133,8 +274,11 @@ void plat_gvideo_close(void) void plat_video_menu_enter(int is_rom_loaded) { + 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); + // FIXME? + memcpy(menubg_img, screen->pixels, psx_w * psx_h * 2); pl_vout_buf = menubg_img; change_video_mode(g_menuscreen_w, g_menuscreen_h); @@ -155,6 +299,7 @@ void plat_video_menu_end(void) void plat_video_menu_leave(void) { + in_menu = 0; } /* unused stuff */ @@ -163,25 +308,6 @@ 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) { } -- cgit v1.2.3 From c9099d020a1e523d97541f426f7d44da1392526f Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 18 Nov 2012 00:31:30 +0200 Subject: frontend: overlay improvements work directly on psx vram --- frontend/plat_sdl.c | 137 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 48 deletions(-) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index a899c15..3661149 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -14,6 +14,8 @@ #include "libpicofe/input.h" #include "libpicofe/in_sdl.h" #include "libpicofe/menu.h" +#include "libpicofe/fonts.h" +#include "../plugins/gpulib/cspace.h" #include "plugin_lib.h" #include "main.h" #include "menu.h" @@ -58,7 +60,9 @@ static int window_w, window_h; static int fs_w, fs_h; static int psx_w, psx_h; static void *menubg_img; -static int in_menu, pending_resize, old_fullscreen; +static int in_menu, old_fullscreen; + +static void overlay_clear(void); static int change_video_mode(int w, int h) { @@ -98,6 +102,8 @@ static int change_video_mode(int w, int h) if (!overlay->hw_overlay) fprintf(stderr, "warning: video overlay is not hardware accelerated," " you may want to disable it.\n"); + + overlay_clear(); } else { fprintf(stderr, "warning: could not create overlay.\n"); @@ -130,7 +136,7 @@ static void event_handler(void *event_) if (overlay != NULL && !g_fullscreen && !old_fullscreen) { window_w = event->resize.w; window_h = event->resize.h; - pending_resize = 1; + change_video_mode(psx_w, psx_h); } } } @@ -189,6 +195,8 @@ void plat_init(void) in_sdl_init(in_sdl_defbinds, event_handler); in_probe(); pl_rearmed_cbs.only_16bpp = 1; + + bgr_to_uyvy_init(); return; fail: @@ -207,65 +215,96 @@ void plat_gvideo_open(int is_pal) { } -void *plat_gvideo_set_mode(int *w, int *h, int *bpp) +static void uyvy_to_rgb565(void *d, const void *s, int pixels) { - change_video_mode(*w, *h); - return screen->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 test_convert(void *d, const void *s, int pixels) +static void overlay_clear(void) { - unsigned int *dst = d; - const unsigned short *src = s; - int r0, g0, b0, r1, g1, b1; - int y0, y1, u, v; - - for (; pixels > 0; src += 2, dst++, pixels -= 2) { - r0 = src[0] >> 11; - g0 = (src[0] >> 6) & 0x1f; - b0 = src[0] & 0x1f; - r1 = src[1] >> 11; - g1 = (src[1] >> 6) & 0x1f; - b1 = src[1] & 0x1f; - y0 = (int)((0.299f * r0) + (0.587f * g0) + (0.114f * b0)); - y1 = (int)((0.299f * r1) + (0.587f * g1) + (0.114f * b1)); - //u = (int)(((-0.169f * r0) + (-0.331f * g0) + ( 0.499f * b0)) * 8) + 128; - //v = (int)((( 0.499f * r0) + (-0.418f * g0) + (-0.0813f * b0)) * 8) + 128; - u = (int)(8 * 0.565f * (b0 - y0)) + 128; - v = (int)(8 * 0.713f * (r0 - y0)) + 128; - // valid Y range seems to be 16..235 - y0 = 16 + 219 * y0 / 31; - y1 = 16 + 219 * y1 / 31; - - if (y0 < 0 || y0 > 255 || y1 < 0 || y1 > 255 - || u < 0 || u > 255 || v < 0 || v > 255) - { - printf("oor: %d, %d, %d, %d\n", y0, y1, u, v); - } - *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u; + int pixels = overlay->w * overlay->h; + int *dst = (int *)overlay->pixels[0]; + int v = 0x10801080; + + for (; pixels > 0; dst += 4, pixels -= 2 * 4) + dst[0] = dst[1] = dst[2] = dst[3] = v; + + for (; pixels > 0; dst++, pixels -= 2) + *dst = 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 = overlay->w; + + SDL_LockYUVOverlay(overlay); + dst = (void *)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(overlay); +} + +static void overlay_hud_print(int x, int y, const char *str, int bpp) +{ + SDL_LockYUVOverlay(overlay); + basic_text_out_uyvy_nf(overlay->pixels[0], overlay->w, x, y, str); + SDL_UnlockYUVOverlay(overlay); +} + +void *plat_gvideo_set_mode(int *w, int *h, int *bpp) +{ + change_video_mode(*w, *h); + if (overlay != NULL) { + pl_plat_clear = 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; + return screen->pixels; } } -/* XXX: missing SDL_LockSurface() */ void *plat_gvideo_flip(void) { if (!in_menu && overlay != NULL) { SDL_Rect dstrect = { 0, 0, screen->w, screen->h }; - SDL_LockYUVOverlay(overlay); - test_convert(overlay->pixels[0], screen->pixels, overlay->w * overlay->h); - SDL_UnlockYUVOverlay(overlay); SDL_DisplayYUVOverlay(overlay, &dstrect); + return NULL; } - else + else { + // XXX: missing SDL_LockSurface() SDL_Flip(screen); - - if (pending_resize || g_fullscreen != old_fullscreen) { - // must be done here so that correct buffer is returned - change_video_mode(psx_w, psx_h); - pending_resize = 0; + return screen->pixels; } - - return screen->pixels; } void plat_gvideo_close(void) @@ -277,8 +316,10 @@ void plat_video_menu_enter(int is_rom_loaded) in_menu = 1; /* surface will be lost, must adjust pl_vout_buf for menu bg */ - // FIXME? - memcpy(menubg_img, screen->pixels, psx_w * psx_h * 2); + if (overlay != NULL) + uyvy_to_rgb565(menubg_img, overlay->pixels[0], psx_w * psx_h); + else + memcpy(menubg_img, screen->pixels, psx_w * psx_h * 2); pl_vout_buf = menubg_img; change_video_mode(g_menuscreen_w, g_menuscreen_h); -- cgit v1.2.3 From 6949dd2a369531ccf38c3f4fae7f6fcf3be6dcc6 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 19 Nov 2012 00:29:24 +0200 Subject: frontend: sdl: autodisable overlay if not accelerated just tried it on r-pi, it's just way too slow --- frontend/plat_sdl.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'frontend/plat_sdl.c') diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 3661149..9862e2b 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -99,11 +99,16 @@ static int change_video_mode(int w, int h) if ((long)overlay->pixels[0] & 3) fprintf(stderr, "warning: overlay pointer is unaligned\n"); - if (!overlay->hw_overlay) - fprintf(stderr, "warning: video overlay is not hardware accelerated," - " you may want to disable it.\n"); - overlay_clear(); + if (!overlay->hw_overlay) { + fprintf(stderr, "warning: video overlay is not hardware accelerated, " + "disabling it.\n"); + g_use_overlay = 0; + SDL_FreeYUVOverlay(overlay); + overlay = NULL; + } + else + overlay_clear(); } else { fprintf(stderr, "warning: could not create overlay.\n"); -- cgit v1.2.3