X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=c6a2bf0e143ea2ef7b6fe51cbfeb1b3c5cbd7be5;hp=5017a1bbede866ef5dcdbf183644d6d068649bf4;hb=2391c1b4a91068853fb2d783c8f7613658be4250;hpb=e0aec5eebf0fefe7a7314940546ef8a23d2169b7 diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 5017a1bb..c6a2bf0e 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -28,25 +28,36 @@ #include "plat.h" #include "pcnt.h" #include "pl_gun_ts.h" +#include "cspace.h" +#include "psemu_plugin_defs.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../libpcsxcore/psemu_plugin_defs.h" -#include "../plugins/gpulib/cspace.h" +#include "../libpcsxcore/psxmem_map.h" +#include "../plugins/dfinput/externals.h" + +#define HUD_HEIGHT 10 int in_type1, in_type2; int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 }; int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }}; +int in_adev_is_nublike[2]; int in_keystate, in_state_gun; int in_enable_vibration; void *tsdev; void *pl_vout_buf; int g_layer_x, g_layer_y, g_layer_w, g_layer_h; static int pl_vout_w, pl_vout_h, pl_vout_bpp; /* output display/layer */ -static int pl_vout_scale; +static int pl_vout_scale_w, pl_vout_scale_h, pl_vout_yoffset; static int psx_w, psx_h, psx_bpp; static int vsync_cnt; static int is_pal, frame_interval, frame_interval1024; static int vsync_usec_time; +// platform hooks +void (*pl_plat_clear)(void); +void (*pl_plat_blit)(int doffs, const void *src, int w, int h, + int sstride, int bgr24); +void (*pl_plat_hud_print)(int x, int y, const char *str, int bpp); + static __attribute__((noinline)) int get_cpu_ticks(void) { @@ -64,27 +75,48 @@ static __attribute__((noinline)) int get_cpu_ticks(void) sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %lu", &utime); ret = utime - last_utime; + if (ret > 200) + ret = 0; last_utime = utime; return ret; } +static void hud_print(void *fb, int w, int x, int y, const char *text) +{ + if (pl_plat_hud_print) + pl_plat_hud_print(x, y, text, pl_vout_bpp); + else if (pl_vout_bpp == 16) + basic_text_out16_nf(fb, w, x, y, text); +} + +static void hud_printf(void *fb, int w, int x, int y, const char *texto, ...) +{ + va_list args; + char buffer[256]; + + va_start(args, texto); + vsnprintf(buffer, sizeof(buffer), texto, args); + va_end(args); + + hud_print(fb, w, x, y, buffer); +} + static void print_msg(int h, int border) { - if (pl_vout_bpp == 16) - pl_text_out16(border + 2, h - 10, "%s", hud_msg); + hud_print(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT, hud_msg); } static void print_fps(int h, int border) { - if (pl_vout_bpp == 16) - pl_text_out16(border + 2, h - 10, "%2d %4.1f", - pl_rearmed_cbs.flips_per_sec, pl_rearmed_cbs.vsps_cur); + hud_printf(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT, + "%2d %4.1f", pl_rearmed_cbs.flips_per_sec, + pl_rearmed_cbs.vsps_cur); } static void print_cpu_usage(int w, int h, int border) { - if (pl_vout_bpp == 16) - pl_text_out16(w - border - 28, h - 10, "%3d", pl_rearmed_cbs.cpu_usage); + hud_printf(pl_vout_buf, pl_vout_w, pl_vout_w - border - 28, + h - HUD_HEIGHT, "%3d", pl_rearmed_cbs.cpu_usage); } // draw 192x8 status of 24 sound channels @@ -96,11 +128,11 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h) static const unsigned short colors[2] = { 0x1fe3, 0x0700 }; unsigned short *dest = (unsigned short *)pl_vout_buf + - vout_w * (vout_h - 10) + vout_w / 2 - 192/2; + vout_w * (vout_h - HUD_HEIGHT) + vout_w / 2 - 192/2; unsigned short *d, p; int c, x, y; - if (pl_vout_bpp != 16) + if (dest == NULL || pl_vout_bpp != 16) return; spu_get_debug_info(&live_chans, &run_chans, &fmod_chans, &noise_chans); @@ -117,11 +149,16 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h) } } -void pl_print_hud(int w, int h, int xborder) +static void print_hud(int w, int h, int xborder) { if (h < 16) return; + if (w < pl_vout_w) + xborder += (pl_vout_w - w) / 2; + if (h > pl_vout_h) + h = pl_vout_h; + if (g_opts & OPT_SHOWSPU) draw_active_chans(w, h); @@ -145,6 +182,14 @@ static void update_layer_size(int w, int h) g_layer_w = w; g_layer_h = h; break; + case SCALE_2_2: + g_layer_w = w; g_layer_h = h; + if (w * 2 <= g_menuscreen_w) + g_layer_w = w * 2; + if (h * 2 <= g_menuscreen_h) + g_layer_h = h * 2; + break; + case SCALE_4_3v2: if (h > g_menuscreen_h || (240 < h && h <= 360)) goto fractional_4_3; @@ -187,14 +232,15 @@ static void update_layer_size(int w, int h) } // XXX: this is platform specific really -static int resolution_ok(int w, int h) +static inline int resolution_ok(int w, int h) { return w <= 1024 && h <= 512; } -static void pl_vout_set_mode(int w, int h, int bpp) +static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp) { int vout_w, vout_h, vout_bpp; + int buf_yoffset = 0; // special h handling, Wipeout likes to change it by 1-6 static int vsync_cnt_ms_prev; @@ -202,40 +248,56 @@ static void pl_vout_set_mode(int w, int h, int bpp) h = (h + 7) & ~7; vsync_cnt_ms_prev = vsync_cnt; - vout_w = psx_w = w; - vout_h = psx_h = h; - vout_bpp = psx_bpp = bpp; + psx_w = raw_w; + psx_h = raw_h; + psx_bpp = bpp; + vout_w = w; + vout_h = h; + vout_bpp = bpp; + if (pl_rearmed_cbs.only_16bpp) + vout_bpp = 16; + + // don't use very low heights + if (vout_h < 192) { + buf_yoffset = (192 - vout_h) / 2; + vout_h = 192; + } - pl_vout_scale = 1; + pl_vout_scale_w = pl_vout_scale_h = 1; #ifdef __ARM_NEON__ if (soft_filter) { if (resolution_ok(w * 2, h * 2) && bpp == 16) { - vout_w *= 2; - vout_h *= 2; - pl_vout_scale = 2; + pl_vout_scale_w = 2; + pl_vout_scale_h = 2; } else { // filter unavailable hud_msg[0] = 0; } } + else if (scanlines != 0 && scanline_level != 100 && bpp == 16) { + if (h <= 256) + pl_vout_scale_h = 2; + } #endif - - if (pl_vout_buf != NULL && vout_w == pl_vout_w && vout_h == pl_vout_h - && vout_bpp == pl_vout_bpp) - return; + vout_w *= pl_vout_scale_w; + vout_h *= pl_vout_scale_h; update_layer_size(vout_w, vout_h); pl_vout_buf = plat_gvideo_set_mode(&vout_w, &vout_h, &vout_bpp); - if (pl_vout_buf == NULL) + if (pl_vout_buf == NULL && pl_plat_blit == NULL) fprintf(stderr, "failed to set mode %dx%d@%d\n", - psx_w, psx_h, psx_bpp); + vout_w, vout_h, vout_bpp); else { pl_vout_w = vout_w; pl_vout_h = vout_h; pl_vout_bpp = vout_bpp; + pl_vout_yoffset = buf_yoffset; } + if (pl_vout_buf != NULL) + pl_vout_buf = (char *)pl_vout_buf + + pl_vout_yoffset * pl_vout_w * pl_vout_bpp / 8; menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp); } @@ -250,28 +312,43 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h) pcnt_start(PCNT_BLIT); - if (dest == NULL) - goto out; - if (vram == NULL) { // blanking - memset(pl_vout_buf, 0, dstride * pl_vout_h * pl_vout_bpp / 8); - goto out; + if (pl_plat_clear) + pl_plat_clear(); + else + memset(pl_vout_buf, 0, + dstride * pl_vout_h * pl_vout_bpp / 8); + goto out_hud; } // borders - doffs = (dstride - w * pl_vout_scale) / 2 & ~1; - dest += doffs * 2; + doffs = (dstride - w * pl_vout_scale_w) / 2 & ~1; if (doffs > doffs_old) clear_counter = 2; doffs_old = doffs; if (clear_counter > 0) { - memset(pl_vout_buf, 0, dstride * pl_vout_h * pl_vout_bpp / 8); + if (pl_plat_clear) + pl_plat_clear(); + else + memset(pl_vout_buf, 0, + dstride * pl_vout_h * pl_vout_bpp / 8); clear_counter--; } + if (pl_plat_blit) + { + pl_plat_blit(doffs, src, w, h, stride, bgr24); + goto out_hud; + } + + if (dest == NULL) + goto out; + + dest += doffs * 2; + if (bgr24) { if (pl_rearmed_cbs.only_16bpp) { @@ -291,32 +368,54 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h) } } #ifdef __ARM_NEON__ - else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale == 2) + else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale_w == 2) { neon_scale2x_16_16(src, (void *)dest, w, - stride * 2, dstride * 2, h1); + stride * 2, dstride * 2, h); } - else if (soft_filter == SOFT_FILTER_EAGLE2X && pl_vout_scale == 2) + else if (soft_filter == SOFT_FILTER_EAGLE2X && pl_vout_scale_w == 2) { neon_eagle2x_16_16(src, (void *)dest, w, - stride * 2, dstride * 2, h1); + stride * 2, dstride * 2, h); + } + else if (scanlines != 0 && scanline_level != 100) + { + int l = scanline_level * 2048 / 100; + int stride_0 = pl_vout_scale_h >= 2 ? 0 : stride; + + h1 *= pl_vout_scale_h; + for (; h1 >= 2; h1 -= 2) + { + bgr555_to_rgb565(dest, src, w * 2); + dest += dstride * 2, src += stride_0; + + bgr555_to_rgb565_b(dest, src, w * 2, l); + dest += dstride * 2, src += stride; + } } #endif else { + src = (void *)((uintptr_t)src & ~3); // align for the blitter + for (; h1-- > 0; dest += dstride * 2, src += stride) { bgr555_to_rgb565(dest, src, w * 2); } } - pl_print_hud(w * pl_vout_scale, h * pl_vout_scale, 0); +out_hud: + print_hud(w * pl_vout_scale_w, h * pl_vout_scale_h, 0); out: pcnt_end(PCNT_BLIT); // let's flip now pl_vout_buf = plat_gvideo_flip(); + if (pl_vout_buf != NULL) + pl_vout_buf = (char *)pl_vout_buf + + pl_vout_yoffset * pl_vout_w * pl_vout_bpp / 8; + pl_rearmed_cbs.flip_cnt++; } @@ -369,7 +468,8 @@ static int dispmode_default(void) return 1; } -int dispmode_doubleres(void) +#ifdef __ARM_NEON__ +static int dispmode_doubleres(void) { if (!(pl_rearmed_cbs.gpu_caps & GPU_CAP_SUPPORTS_2X) || !resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16) @@ -381,9 +481,9 @@ int dispmode_doubleres(void) return 1; } -int dispmode_scale2x(void) +static int dispmode_scale2x(void) { - if (psx_bpp != 16) + if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16) return 0; dispmode_default(); @@ -392,9 +492,9 @@ int dispmode_scale2x(void) return 1; } -int dispmode_eagle2x(void) +static int dispmode_eagle2x(void) { - if (psx_bpp != 16) + if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16) return 0; dispmode_default(); @@ -402,6 +502,7 @@ int dispmode_eagle2x(void) snprintf(hud_msg, sizeof(hud_msg), "eagle2x"); return 1; } +#endif static int (*dispmode_switchers[])(void) = { dispmode_default, @@ -430,9 +531,39 @@ void pl_switch_dispmode(void) } #ifndef MAEMO +/* adjust circle-like analog inputs to better match + * more square-like analogs in PSX */ +static void update_analog_nub_adjust(int *x_, int *y_) +{ + #define d 16 + static const int scale[] = + { 0 - d*2, 0 - d*2, 0 - d*2, 12 - d*2, + 30 - d*2, 60 - d*2, 75 - d*2, 60 - d*2, 60 - d*2 }; + int x = abs(*x_); + int y = abs(*y_); + int scale_x = scale[y / 16]; + int scale_y = scale[x / 16]; + + if (x) { + x += d + (x * scale_x >> 8); + if (*x_ < 0) + x = -x; + } + if (y) { + y += d + (y * scale_y >> 8); + if (*y_ < 0) + y = -y; + } + + *x_ = x; + *y_ = y; + #undef d +} + static void update_analogs(void) { int *nubp[2] = { in_a1, in_a2 }; + int vals[2]; int i, a, v, ret; for (i = 0; i < 2; i++) @@ -441,14 +572,23 @@ static void update_analogs(void) continue; for (a = 0; a < 2; a++) { - nubp[i][a] = 127; + vals[a] = 0; ret = in_update_analog(in_adev[i], in_adev_axis[i][a], &v); - if (ret == 0) { - v = v / (IN_ABS_RANGE / 128) + 127; - nubp[i][a] = v < 0 ? 0 : v; - } + if (ret == 0) + vals[a] = 128 * v / IN_ABS_RANGE; } + + if (in_adev_is_nublike[i]) + update_analog_nub_adjust(&vals[0], &vals[1]); + + for (a = 0; a < 2; a++) { + v = vals[a] + 127; + if (v < 0) v = 0; + else if (v > 255) v = 255; + nubp[i][a] = v; + } + } //printf("%4d %4d %4d %4d\n", in_a1[0], in_a1[1], in_a2[0], in_a2[1]); } @@ -476,18 +616,16 @@ static void update_input(void) in_keystate = actions[IN_BINDTYPE_PLAYER12]; } #else /* MAEMO */ -static void update_input(void) -{ -} +extern void update_input(void); #endif -void pl_update_gun(int *xn, int *xres, int *y, int *in) +void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in) { if (tsdev) - pl_gun_ts_update(tsdev, xn, y, in); + pl_gun_ts_update(tsdev, xn, yn, in); - *xres = pl_vout_w; - *y = *y * pl_vout_h >> 10; + *xres = psx_w; + *yres = psx_h; } #define MAX_LAG_FRAMES 3 @@ -503,6 +641,9 @@ void pl_frame_limit(void) struct timeval now; int diff, usadj; + if (g_emu_resetting) + return; + vsync_cnt++; /* doing input here because the pad is polled @@ -602,57 +743,6 @@ void pl_timing_prepare(int is_pal_) (100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100)); } -static void pl_text_out16_(int x, int y, const char *text) -{ - int i, l, w = pl_vout_w; - unsigned short *screen; - unsigned short val = 0xffff; - - x &= ~1; - screen = (unsigned short *)pl_vout_buf + x + y * w; - for (i = 0; ; i++, screen += 8) - { - char c = text[i]; - if (c == 0) - break; - if (c == ' ') - continue; - - for (l = 0; l < 8; l++) - { - unsigned char fd = fontdata8x8[c * 8 + l]; - unsigned short *s = screen + l * w; - unsigned int *s32 = (void *)s; - - s32[0] = (s32[0] >> 1) & 0x7bef7bef; - s32[1] = (s32[1] >> 1) & 0x7bef7bef; - s32[2] = (s32[2] >> 1) & 0x7bef7bef; - s32[3] = (s32[3] >> 1) & 0x7bef7bef; - - if (fd&0x80) s[0] = val; - if (fd&0x40) s[1] = val; - if (fd&0x20) s[2] = val; - if (fd&0x10) s[3] = val; - if (fd&0x08) s[4] = val; - if (fd&0x04) s[5] = val; - if (fd&0x02) s[6] = val; - if (fd&0x01) s[7] = val; - } - } -} - -void pl_text_out16(int x, int y, const char *texto, ...) -{ - va_list args; - char buffer[256]; - - va_start(args, texto); - vsnprintf(buffer, sizeof(buffer), texto, args); - va_end(args); - - pl_text_out16_(x, y, buffer); -} - static void pl_get_layer_pos(int *x, int *y, int *w, int *h) { *x = g_layer_x; @@ -661,15 +751,8 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h) *h = g_layer_h; } -static void *pl_mmap(unsigned int size) -{ - return plat_mmap(0, size, 0, 0); -} - -static void pl_munmap(void *ptr, unsigned int size) -{ - plat_munmap(ptr, size); -} +static void *pl_mmap(unsigned int size); +static void pl_munmap(void *ptr, unsigned int size); struct rearmed_cbs pl_rearmed_cbs = { pl_get_layer_pos, @@ -737,6 +820,27 @@ void pl_start_watchdog(void) fprintf(stderr, "could not start watchdog: %d\n", ret); } +static void *pl_emu_mmap(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag) +{ + return plat_mmap(addr, size, 0, is_fixed); +} + +static void pl_emu_munmap(void *ptr, size_t size, enum psxMapTag tag) +{ + plat_munmap(ptr, size); +} + +static void *pl_mmap(unsigned int size) +{ + return psxMapHook(0, size, 0, MAP_TAG_VRAM); +} + +static void pl_munmap(void *ptr, unsigned int size) +{ + psxUnmapHook(ptr, size, MAP_TAG_VRAM); +} + void pl_init(void) { extern unsigned int hSyncCount; // from psxcounters @@ -749,4 +853,7 @@ void pl_init(void) pl_rearmed_cbs.gpu_hcnt = &hSyncCount; pl_rearmed_cbs.gpu_frame_count = &frame_counter; + + psxMapHook = pl_emu_mmap; + psxUnmapHook = pl_emu_munmap; }