#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
+#include "../libpcsxcore/psxmem_map.h"
#include "../plugins/gpulib/cspace.h"
+#include "../plugins/dfinput/externals.h"
int in_type1, in_type2;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
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)
{
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 - 10, 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 - 10,
+ "%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 - 10,
+ "%3d", pl_rearmed_cbs.cpu_usage);
}
// draw 192x8 status of 24 sound channels
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);
}
}
-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);
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;
h = (h + 7) & ~7;
vsync_cnt_ms_prev = vsync_cnt;
- vout_w = psx_w = w;
- vout_h = psx_h = h;
+ psx_w = raw_w;
+ psx_h = raw_h;
+ vout_w = w;
+ vout_h = h;
vout_bpp = psx_bpp = bpp;
pl_vout_scale = 1;
}
#endif
- if (pl_vout_buf != NULL && vout_w == pl_vout_w && vout_h == pl_vout_h
- && vout_bpp == pl_vout_bpp)
- return;
-
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, psx_bpp);
else {
pl_vout_w = vout_w;
pl_vout_h = vout_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;
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) {
else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale == 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)
{
neon_eagle2x_16_16(src, (void *)dest, w,
- stride * 2, dstride * 2, h1);
+ stride * 2, dstride * 2, h);
}
#endif
else
}
}
- pl_print_hud(w * pl_vout_scale, h * pl_vout_scale, 0);
+out_hud:
+ print_hud(w * pl_vout_scale, h * pl_vout_scale, 0);
out:
pcnt_end(PCNT_BLIT);
int dispmode_scale2x(void)
{
- if (psx_bpp != 16)
+ if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16)
return 0;
dispmode_default();
int dispmode_eagle2x(void)
{
- if (psx_bpp != 16)
+ if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16)
return 0;
dispmode_default();
* more square-like analogs in PSX */
static void update_analog_nub_adjust(int *x_, int *y_)
{
- const int d = 16;
+ #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 };
*x_ = x;
*y_ = y;
+ #undef d
}
static void update_analogs(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
(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;
*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,
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
pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
pl_rearmed_cbs.gpu_frame_count = &frame_counter;
+
+ psxMapHook = pl_emu_mmap;
+ psxUnmapHook = pl_emu_munmap;
}