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
cdrom: cleanup, support errors, improve timing
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
aa771ed
..
dfff868
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-44,7
+44,7
@@
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 */
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
, 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 psx_w, psx_h, psx_bpp;
static int vsync_cnt;
static int is_pal, frame_interval, frame_interval1024;
@@
-230,6
+230,7
@@
static int resolution_ok(int w, int h)
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;
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;
// special h handling, Wipeout likes to change it by 1-6
static int vsync_cnt_ms_prev;
@@
-243,6
+244,12
@@
static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
vout_h = h;
vout_bpp = psx_bpp = bpp;
vout_h = h;
vout_bpp = psx_bpp = bpp;
+ // don't use very low heights
+ if (vout_h < 192) {
+ buf_yoffset = (192 - vout_h) / 2;
+ vout_h = 192;
+ }
+
pl_vout_scale = 1;
#ifdef __ARM_NEON__
if (soft_filter) {
pl_vout_scale = 1;
#ifdef __ARM_NEON__
if (soft_filter) {
@@
-268,7
+275,11
@@
static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
pl_vout_w = vout_w;
pl_vout_h = vout_h;
pl_vout_bpp = vout_bpp;
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);
}
menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp);
}
@@
-366,6
+377,10
@@
out:
// let's flip now
pl_vout_buf = plat_gvideo_flip();
// 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++;
}
pl_rearmed_cbs.flip_cnt++;
}
@@
-591,6
+606,9
@@
void pl_frame_limit(void)
struct timeval now;
int diff, usadj;
struct timeval now;
int diff, usadj;
+ if (g_resetting)
+ return;
+
vsync_cnt++;
/* doing input here because the pad is polled
vsync_cnt++;
/* doing input here because the pad is polled