#include <unistd.h>
#include <pthread.h>
+#include "libpicofe/fonts.h"
+#include "libpicofe/input.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/arm/neon_scale2x.h"
+#include "libpicofe/arm/neon_eagle2x.h"
#include "plugin_lib.h"
-#include "linux/fbdev.h"
-#include "common/fonts.h"
-#include "common/input.h"
-#include "omap.h"
#include "menu.h"
#include "main.h"
+#include "plat.h"
#include "pcnt.h"
#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
+#include "../plugins/gpulib/cspace.h"
-void *pl_fbdev_buf;
-int pl_frame_interval;
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;
-static void *ts;
-static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
-static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
-static float vsps_cur;
+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 psx_w, psx_h, psx_bpp;
+static int vsync_cnt;
+static int is_pal, frame_interval, frame_interval1024;
static int vsync_usec_time;
return ret;
}
-static void print_hud(void)
+static void print_msg(int h, int border)
{
- if (pl_fbdev_bpp == 16)
- pl_text_out16(2, pl_fbdev_h - 10, "%s", hud_msg);
+ if (pl_vout_bpp == 16)
+ basic_text_out16_nf(pl_vout_buf, pl_vout_w,
+ border + 2, h - 10, hud_msg);
}
-static void print_fps(void)
+static void print_fps(int h, int border)
{
- if (pl_fbdev_bpp == 16)
- pl_text_out16(2, pl_fbdev_h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
+ if (pl_vout_bpp == 16)
+ basic_text_out16(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(void)
+static void print_cpu_usage(int w, int h, int border)
{
- if (pl_fbdev_bpp == 16)
- pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
+ if (pl_vout_bpp == 16)
+ basic_text_out16(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
-static __attribute__((noinline)) void draw_active_chans(void)
+static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
{
- extern void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out); // hack
- int live_chans, fmod_chans, noise_chans;
+ extern void spu_get_debug_info(int *chans_out, int *run_chans,
+ int *fmod_chans_out, int *noise_chans_out); // hack
+ int live_chans, run_chans, fmod_chans, noise_chans;
static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
- unsigned short *dest = (unsigned short *)pl_fbdev_buf +
- pl_fbdev_w * (pl_fbdev_h - 10) + pl_fbdev_w / 2 - 192/2;
+ unsigned short *dest = (unsigned short *)pl_vout_buf +
+ vout_w * (vout_h - 10) + vout_w / 2 - 192/2;
unsigned short *d, p;
int c, x, y;
- if (pl_fbdev_bpp != 16)
+ if (pl_vout_bpp != 16)
return;
- spu_get_debug_info(&live_chans, &fmod_chans, &noise_chans);
+ spu_get_debug_info(&live_chans, &run_chans, &fmod_chans, &noise_chans);
for (c = 0; c < 24; c++) {
d = dest + c * 8;
- p = !(live_chans & (1<<c)) ? 0 :
+ p = !(live_chans & (1<<c)) ? (run_chans & (1<<c) ? 0x01c0 : 0) :
(fmod_chans & (1<<c)) ? 0xf000 :
(noise_chans & (1<<c)) ? 0x001f :
colors[c & 1];
- for (y = 0; y < 8; y++, d += pl_fbdev_w)
+ for (y = 0; y < 8; y++, d += vout_w)
for (x = 0; x < 8; x++)
d[x] = p;
}
}
-void *pl_fbdev_set_mode(int w, int h, int bpp)
+void pl_print_hud(int w, int h, int xborder)
{
- void *ret;
+ if (h < 16)
+ return;
- if (w == pl_fbdev_w && h == pl_fbdev_h && bpp == pl_fbdev_bpp)
- return pl_fbdev_buf;
+ xborder += (pl_vout_w - w) / 2;
- pl_fbdev_w = w;
- pl_fbdev_h = h;
- pl_fbdev_bpp = bpp;
+ if (g_opts & OPT_SHOWSPU)
+ draw_active_chans(w, h);
- vout_fbdev_clear(layer_fb);
- ret = vout_fbdev_resize(layer_fb, w, h, bpp, 0, 0, 0, 0, 3);
- if (ret == NULL)
- fprintf(stderr, "failed to set mode\n");
- else
- pl_fbdev_buf = ret;
+ if (hud_msg[0] != 0)
+ print_msg(h, xborder);
+ else if (g_opts & OPT_SHOWFPS)
+ print_fps(h, xborder);
+
+ if (g_opts & OPT_SHOWCPU)
+ print_cpu_usage(w, h, xborder);
+}
- menu_notify_mode_change(w, h, bpp);
+/* update scaler target size according to user settings */
+static void update_layer_size(int w, int h)
+{
+ float mult;
+ int imult;
+
+ switch (g_scaler) {
+ case SCALE_1_1:
+ g_layer_w = w; g_layer_h = h;
+ break;
+
+ case SCALE_4_3v2:
+ if (h > g_menuscreen_h || (240 < h && h <= 360))
+ goto fractional_4_3;
+
+ // 4:3 that prefers integer scaling
+ imult = g_menuscreen_h / h;
+ g_layer_w = w * imult;
+ g_layer_h = h * imult;
+ mult = (float)g_layer_w / (float)g_layer_h;
+ if (mult < 1.25f || mult > 1.666f)
+ g_layer_w = 4.0f/3.0f * (float)g_layer_h;
+ printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+ break;
+
+ fractional_4_3:
+ case SCALE_4_3:
+ mult = 240.0f / (float)h * 4.0f / 3.0f;
+ if (h > 256)
+ mult *= 2.0f;
+ g_layer_w = mult * (float)g_menuscreen_h;
+ g_layer_h = g_menuscreen_h;
+ printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+ break;
+
+ case SCALE_FULLSCREEN:
+ g_layer_w = g_menuscreen_w;
+ g_layer_h = g_menuscreen_h;
+ break;
+
+ default:
+ break;
+ }
+
+ g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+ g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+ if (g_layer_x < 0) g_layer_x = 0;
+ if (g_layer_y < 0) g_layer_y = 0;
+ if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
+ if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+}
- return pl_fbdev_buf;
+// XXX: this is platform specific really
+static int resolution_ok(int w, int h)
+{
+ return w <= 1024 && h <= 512;
}
-void *pl_fbdev_flip(void)
+static void pl_vout_set_mode(int w, int h, int bpp)
{
- flip_cnt++;
+ int vout_w, vout_h, vout_bpp;
+
+ // special h handling, Wipeout likes to change it by 1-6
+ static int vsync_cnt_ms_prev;
+ if ((unsigned int)(vsync_cnt - vsync_cnt_ms_prev) < 5*60)
+ 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;
+
+ pl_vout_scale = 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;
+ }
+ else {
+ // filter unavailable
+ hud_msg[0] = 0;
+ }
+ }
+#endif
- if (pl_fbdev_buf != NULL) {
- if (g_opts & OPT_SHOWSPU)
- draw_active_chans();
+ if (pl_vout_buf != NULL && vout_w == pl_vout_w && vout_h == pl_vout_h
+ && vout_bpp == pl_vout_bpp)
+ return;
- if (hud_msg[0] != 0)
- print_hud();
- else if (g_opts & OPT_SHOWFPS)
- print_fps();
+ update_layer_size(vout_w, vout_h);
- if (g_opts & OPT_SHOWCPU)
- print_cpu_usage();
+ pl_vout_buf = plat_gvideo_set_mode(&vout_w, &vout_h, &vout_bpp);
+ if (pl_vout_buf == NULL)
+ fprintf(stderr, "failed to set mode %dx%d@%d\n",
+ psx_w, psx_h, psx_bpp);
+ else {
+ pl_vout_w = vout_w;
+ pl_vout_h = vout_h;
+ pl_vout_bpp = vout_bpp;
+ }
+
+ menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp);
+}
+
+static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
+{
+ static int doffs_old, clear_counter;
+ unsigned char *dest = pl_vout_buf;
+ const unsigned short *src = vram;
+ int dstride = pl_vout_w, h1 = h;
+ int doffs;
+
+ 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;
+ }
+
+ // 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);
+ clear_counter--;
+ }
+
+ if (bgr24)
+ {
+ if (pl_rearmed_cbs.only_16bpp) {
+ for (; h1-- > 0; dest += dstride * 2, src += stride)
+ {
+ bgr888_to_rgb565(dest, src, w * 3);
+ }
+ }
+ else {
+ dest -= doffs * 2;
+ dest += (doffs / 8) * 24;
+
+ for (; h1-- > 0; dest += dstride * 3, src += stride)
+ {
+ bgr888_to_rgb888(dest, src, w * 3);
+ }
+ }
}
+#ifdef __ARM_NEON__
+ else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale == 2)
+ {
+ neon_scale2x_16_16(src, (void *)dest, w,
+ stride * 2, dstride * 2, h1);
+ }
+ else if (soft_filter == SOFT_FILTER_EAGLE2X && pl_vout_scale == 2)
+ {
+ neon_eagle2x_16_16(src, (void *)dest, w,
+ stride * 2, dstride * 2, h1);
+ }
+#endif
+ else
+ {
+ 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:
+ pcnt_end(PCNT_BLIT);
// let's flip now
- pl_fbdev_buf = vout_fbdev_flip(layer_fb);
- return pl_fbdev_buf;
+ pl_vout_buf = plat_gvideo_flip();
+ pl_rearmed_cbs.flip_cnt++;
}
-int pl_fbdev_open(void)
+static int pl_vout_open(void)
{
struct timeval now;
- pl_fbdev_buf = vout_fbdev_flip(layer_fb);
- omap_enable_layer(1);
+ // force mode update on pl_vout_set_mode() call from gpulib/vout_pl
+ pl_vout_buf = NULL;
+
+ plat_gvideo_open(is_pal);
- // try to align redraws to vsync
- vout_fbdev_wait_vsync(layer_fb);
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
- while (vsync_usec_time >= pl_frame_interval)
- vsync_usec_time -= pl_frame_interval;
+ while (vsync_usec_time >= frame_interval)
+ vsync_usec_time -= frame_interval;
return 0;
}
-void pl_fbdev_close(void)
+static void pl_vout_close(void)
+{
+ plat_gvideo_close();
+}
+
+static void pl_set_gpu_caps(int caps)
{
- omap_enable_layer(0);
+ pl_rearmed_cbs.gpu_caps = caps;
}
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
- *w = pl_fbdev_w;
- *h = pl_fbdev_h;
- *bpp = pl_fbdev_bpp;
+ void *ret = plat_prepare_screenshot(w, h, bpp);
+ if (ret != NULL)
+ return ret;
- return pl_fbdev_buf;
+ *w = pl_vout_w;
+ *h = pl_vout_h;
+ *bpp = pl_vout_bpp;
+
+ return pl_vout_buf;
+}
+
+/* display/redering mode switcher */
+static int dispmode_default(void)
+{
+ pl_rearmed_cbs.gpu_neon.enhancement_enable = 0;
+ soft_filter = SOFT_FILTER_NONE;
+ snprintf(hud_msg, sizeof(hud_msg), "default mode");
+ return 1;
+}
+
+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)
+ return 0;
+
+ dispmode_default();
+ pl_rearmed_cbs.gpu_neon.enhancement_enable = 1;
+ snprintf(hud_msg, sizeof(hud_msg), "double resolution");
+ return 1;
+}
+
+int dispmode_scale2x(void)
+{
+ if (psx_bpp != 16)
+ return 0;
+
+ dispmode_default();
+ soft_filter = SOFT_FILTER_SCALE2X;
+ snprintf(hud_msg, sizeof(hud_msg), "scale2x");
+ return 1;
+}
+
+int dispmode_eagle2x(void)
+{
+ if (psx_bpp != 16)
+ return 0;
+
+ dispmode_default();
+ soft_filter = SOFT_FILTER_EAGLE2X;
+ snprintf(hud_msg, sizeof(hud_msg), "eagle2x");
+ return 1;
+}
+
+static int (*dispmode_switchers[])(void) = {
+ dispmode_default,
+#ifdef __ARM_NEON__
+ dispmode_doubleres,
+ dispmode_scale2x,
+ dispmode_eagle2x,
+#endif
+};
+
+static int dispmode_current;
+
+void pl_switch_dispmode(void)
+{
+ if (pl_rearmed_cbs.gpu_caps & GPU_CAP_OWNS_DISPLAY)
+ return;
+
+ while (1) {
+ dispmode_current++;
+ if (dispmode_current >=
+ sizeof(dispmode_switchers) / sizeof(dispmode_switchers[0]))
+ dispmode_current = 0;
+ if (dispmode_switchers[dispmode_current]())
+ break;
+ }
+}
+
+#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_)
+{
+ const int 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;
+}
+
+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++)
+ {
+ if (in_adev[i] < 0)
+ continue;
+
+ for (a = 0; a < 2; a++) {
+ vals[a] = 0;
+
+ ret = in_update_analog(in_adev[i], in_adev_axis[i][a], &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]);
}
static void update_input(void)
in_update(actions);
if (in_type1 == PSE_PAD_TYPE_ANALOGPAD)
- in_update_analogs();
+ update_analogs();
emu_act = actions[IN_BINDTYPE_EMU];
in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER;
emu_set_action(emu_act);
in_keystate = actions[IN_BINDTYPE_PLAYER12];
-
-#ifdef X11
- extern int x11_update_keys(unsigned int *action);
- in_keystate |= x11_update_keys(&emu_act);
- emu_set_action(emu_act);
-#endif
}
+#else /* MAEMO */
+static void update_input(void)
+{
+}
+#endif
void pl_update_gun(int *xn, int *xres, int *y, int *in)
{
- if (ts)
- pl_gun_ts_update(ts, xn, y, in);
+ if (tsdev)
+ pl_gun_ts_update(tsdev, xn, y, in);
- *xres = pl_fbdev_w;
- *y = *y * pl_fbdev_h >> 10;
+ *xres = pl_vout_w;
+ *y = *y * pl_vout_h >> 10;
}
#define MAX_LAG_FRAMES 3
#define tvdiff(tv, tv_old) \
((tv.tv_sec - tv_old.tv_sec) * 1000000 + tv.tv_usec - tv_old.tv_usec)
-// assumes us < 1000000
-#define tvadd(tv, us) { \
- tv.tv_usec += us; \
- if (tv.tv_usec >= 1000000) { \
- tv.tv_usec -= 1000000; \
- tv.tv_sec++; \
- } \
-}
/* called on every vsync */
void pl_frame_limit(void)
{
static struct timeval tv_old, tv_expect;
- static int vsync_cnt_prev;
+ static int vsync_cnt_prev, drc_active_vsyncs;
struct timeval now;
int diff, usadj;
if (now.tv_sec != tv_old.tv_sec) {
diff = tvdiff(now, tv_old);
- vsps_cur = 0.0f;
+ pl_rearmed_cbs.vsps_cur = 0.0f;
if (0 < diff && diff < 2000000)
- vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
+ pl_rearmed_cbs.vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
vsync_cnt_prev = vsync_cnt;
- flips_per_sec = flip_cnt;
- flip_cnt = 0;
- tv_old = now;
+
+ if (g_opts & OPT_SHOWFPS)
+ pl_rearmed_cbs.flips_per_sec = pl_rearmed_cbs.flip_cnt;
+ pl_rearmed_cbs.flip_cnt = 0;
if (g_opts & OPT_SHOWCPU)
- tick_per_sec = get_cpu_ticks();
+ pl_rearmed_cbs.cpu_usage = get_cpu_ticks();
if (hud_new_msg > 0) {
hud_new_msg--;
if (hud_new_msg == 0)
hud_msg[0] = 0;
}
+ tv_old = now;
}
#ifdef PCNT
static int ya_vsync_count;
if (++ya_vsync_count == PCNT_FRAMES) {
- pcnt_print(vsps_cur);
+ pcnt_print(pl_rearmed_cbs.vsps_cur);
ya_vsync_count = 0;
}
#endif
- tvadd(tv_expect, pl_frame_interval);
- diff = tvdiff(tv_expect, now);
- if (diff > MAX_LAG_FRAMES * pl_frame_interval || diff < -MAX_LAG_FRAMES * pl_frame_interval) {
- //printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
+ // tv_expect uses usec*1024 units instead of usecs for better accuracy
+ tv_expect.tv_usec += frame_interval1024;
+ if (tv_expect.tv_usec >= (1000000 << 10)) {
+ tv_expect.tv_usec -= (1000000 << 10);
+ tv_expect.tv_sec++;
+ }
+ diff = (tv_expect.tv_sec - now.tv_sec) * 1000000 + (tv_expect.tv_usec >> 10) - now.tv_usec;
+
+ if (diff > MAX_LAG_FRAMES * frame_interval || diff < -MAX_LAG_FRAMES * frame_interval) {
+ //printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, frame_interval);
tv_expect = now;
diff = 0;
// try to align with vsync
usadj = vsync_usec_time;
- while (usadj < tv_expect.tv_usec - pl_frame_interval)
- usadj += pl_frame_interval;
- tv_expect.tv_usec = usadj;
+ while (usadj < tv_expect.tv_usec - frame_interval)
+ usadj += frame_interval;
+ tv_expect.tv_usec = usadj << 10;
}
- if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
+ if (!(g_opts & OPT_NO_FRAMELIM) && diff > frame_interval) {
// yay for working usleep on pandora!
- //printf("usleep %d\n", diff - pl_frame_interval / 2);
- usleep(diff - pl_frame_interval / 2);
+ //printf("usleep %d\n", diff - frame_interval / 2);
+ usleep(diff - frame_interval);
}
if (pl_rearmed_cbs.frameskip) {
- if (diff < -pl_frame_interval)
+ if (diff < -frame_interval)
pl_rearmed_cbs.fskip_advice = 1;
else if (diff >= 0)
pl_rearmed_cbs.fskip_advice = 0;
- }
-
- pcnt_start(PCNT_ALL);
-}
-
-static void pl_text_out16_(int x, int y, const char *text)
-{
- int i, l, len = strlen(text), w = pl_fbdev_w;
- unsigned short *screen = (unsigned short *)pl_fbdev_buf + x + y * w;
- unsigned short val = 0xffff;
- for (i = 0; i < len; i++, screen += 8)
- {
- for (l = 0; l < 8; l++)
- {
- unsigned char fd = fontdata8x8[text[i] * 8 + l];
- unsigned short *s = screen + l * w;
- 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;
+ // recompilation is not that fast and may cause frame skip on
+ // loading screens and such, resulting in flicker or glitches
+ if (new_dynarec_did_compile) {
+ if (drc_active_vsyncs < 32)
+ pl_rearmed_cbs.fskip_advice = 0;
+ drc_active_vsyncs++;
}
+ else
+ drc_active_vsyncs = 0;
+ new_dynarec_did_compile = 0;
}
+
+ pcnt_start(PCNT_ALL);
}
-void pl_text_out16(int x, int y, const char *texto, ...)
+void pl_timing_prepare(int is_pal_)
{
- 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);
+ pl_rearmed_cbs.fskip_advice = 0;
+ pl_rearmed_cbs.flips_per_sec = 0;
+ pl_rearmed_cbs.cpu_usage = 0;
+
+ is_pal = is_pal_;
+ frame_interval = is_pal ? 20000 : 16667;
+ frame_interval1024 = is_pal ? 20000*1024 : 17066667;
+
+ // used by P.E.Op.S. frameskip code
+ pl_rearmed_cbs.gpu_peops.fFrameRateHz = is_pal ? 50.0f : 59.94f;
+ pl_rearmed_cbs.gpu_peops.dwFrameRateTicks =
+ (100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100));
}
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);
+}
+
struct rearmed_cbs pl_rearmed_cbs = {
pl_get_layer_pos,
- pl_fbdev_open,
- pl_fbdev_set_mode,
- pl_fbdev_flip,
- pl_fbdev_close,
+ pl_vout_open,
+ pl_vout_set_mode,
+ pl_vout_flip,
+ pl_vout_close,
+
+ .mmap = pl_mmap,
+ .munmap = pl_munmap,
+ .pl_set_gpu_caps = pl_set_gpu_caps,
};
/* watchdog */
int seen_dead = 0;
int sleep_time = 5;
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DRC_DBG)
// don't interfere with debug
return NULL;
#endif
void pl_init(void)
{
- ts = pl_gun_ts_init();
+ extern unsigned int hSyncCount; // from psxcounters
+ extern unsigned int frame_counter;
+
+ psx_w = psx_h = pl_vout_w = pl_vout_h = 256;
+ psx_bpp = pl_vout_bpp = 16;
+
+ tsdev = pl_gun_ts_init();
+
+ pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
+ pl_rearmed_cbs.gpu_frame_count = &frame_counter;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff