notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: track output and psx sizes separately
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
dbfdb36
..
1a925ec
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-37,9
+37,11
@@
int in_enable_vibration;
void *tsdev;
void *pl_vout_buf;
int g_layer_x, g_layer_y, g_layer_w, g_layer_h;
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;
+static int pl_vout_w, pl_vout_h, pl_vout_bpp; /* output display/layer */
+static int psx_w, psx_h, psx_bpp;
static int vsync_cnt;
static int vsync_cnt;
-static int frame_interval, frame_interval1024, vsync_usec_time;
+static int is_pal, frame_interval, frame_interval1024;
+static int vsync_usec_time;
static __attribute__((noinline)) int get_cpu_ticks(void)
static __attribute__((noinline)) int get_cpu_ticks(void)
@@
-115,6
+117,9
@@
void pl_print_hud(int xborder)
{
int w = pl_vout_w, h = pl_vout_h;
{
int w = pl_vout_w, h = pl_vout_h;
+ if (h < 16)
+ return;
+
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
@@
-135,18
+140,19
@@
static void *pl_vout_set_mode(int w, int h, int bpp)
h = (h + 7) & ~7;
vsync_cnt_ms_prev = vsync_cnt;
h = (h + 7) & ~7;
vsync_cnt_ms_prev = vsync_cnt;
- if (w == p
l_vout_w && h == pl_vout_h && bpp == pl_vout
_bpp)
+ if (w == p
sx_w && h == psx_h && bpp == psx
_bpp)
return pl_vout_buf;
return pl_vout_buf;
- pl_vout_w = w;
- pl_vout_h = h;
- pl_vout_bpp = bpp;
+ pl_vout_w =
psx_w =
w;
+ pl_vout_h =
psx_h =
h;
+ pl_vout_bpp =
psx_bpp =
bpp;
pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp);
pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp);
- if (pl_vout_buf == NULL)
- fprintf(stderr, "failed to set mode\n");
+ if (pl_vout_buf == NULL && pl_rearmed_cbs.pl_vout_raw_flip == NULL)
+ fprintf(stderr, "failed to set mode %dx%d@%d\n",
+ psx_w, psx_h, psx_bpp);
- menu_notify_mode_change(
w, h,
bpp);
+ menu_notify_mode_change(
pl_vout_w, pl_vout_h, pl_vout_
bpp);
return pl_vout_buf;
}
return pl_vout_buf;
}
@@
-170,11
+176,11
@@
static int pl_vout_open(void)
int h;
// force mode update
int h;
// force mode update
- h = p
l_vout
_h;
- p
l_vout
_h--;
- pl_vout_buf = pl_vout_set_mode(p
l_vout_w, h, pl_vout
_bpp);
+ h = p
sx
_h;
+ p
sx
_h--;
+ pl_vout_buf = pl_vout_set_mode(p
sx_w, h, psx
_bpp);
- plat_gvideo_open();
+ plat_gvideo_open(
is_pal
);
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
@@
-364,12
+370,13
@@
void pl_frame_limit(void)
pcnt_start(PCNT_ALL);
}
pcnt_start(PCNT_ALL);
}
-void pl_timing_prepare(int is_pal)
+void pl_timing_prepare(int is_pal
_
)
{
pl_rearmed_cbs.fskip_advice = 0;
pl_rearmed_cbs.flips_per_sec = 0;
pl_rearmed_cbs.cpu_usage = 0;
{
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;
frame_interval = is_pal ? 20000 : 16667;
frame_interval1024 = is_pal ? 20000*1024 : 17066667;
@@
-490,8
+497,8
@@
void pl_init(void)
extern unsigned int hSyncCount; // from psxcounters
extern unsigned int frame_counter;
extern unsigned int hSyncCount; // from psxcounters
extern unsigned int frame_counter;
- pl_vout_w = pl_vout_h = 256;
- pl_vout_bpp = 16;
+ p
sx_w = psx_h = p
l_vout_w = pl_vout_h = 256;
+ p
sx_bpp = p
l_vout_bpp = 16;
tsdev = pl_gun_ts_init();
tsdev = pl_gun_ts_init();