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
gles: tweak Makefile, credits
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
83ae892
..
0ca45ce
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-62,12
+62,6
@@
static void print_cpu_usage(void)
pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
}
pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
}
-int pl_fbdev_init(void)
-{
- pl_fbdev_buf = vout_fbdev_flip(layer_fb);
- return 0;
-}
-
int pl_fbdev_set_mode(int w, int h, int bpp)
{
void *ret;
int pl_fbdev_set_mode(int w, int h, int bpp)
{
void *ret;
@@
-86,7
+80,7
@@
int pl_fbdev_set_mode(int w, int h, int bpp)
else
pl_fbdev_buf = ret;
else
pl_fbdev_buf = ret;
- menu_notify_mode_change(w, h);
+ menu_notify_mode_change(w, h
, bpp
);
return (ret != NULL) ? 0 : -1;
}
return (ret != NULL) ? 0 : -1;
}
@@
-94,15
+88,25
@@
int pl_fbdev_set_mode(int w, int h, int bpp)
void pl_fbdev_flip(void)
{
flip_cnt++;
void pl_fbdev_flip(void)
{
flip_cnt++;
- print_fps();
- print_cpu_usage();
+ if (g_opts & OPT_SHOWFPS)
+ print_fps();
+ if (g_opts & OPT_SHOWCPU)
+ print_cpu_usage();
// let's flip now
pl_fbdev_buf = vout_fbdev_flip(layer_fb);
}
// let's flip now
pl_fbdev_buf = vout_fbdev_flip(layer_fb);
}
-void pl_fbdev_finish(void)
+int pl_fbdev_open(void)
+{
+ pl_fbdev_buf = vout_fbdev_flip(layer_fb);
+ omap_enable_layer(1);
+ return 0;
+}
+
+void pl_fbdev_close(void)
{
{
+ omap_enable_layer(0);
}
static void update_input(void)
}
static void update_input(void)
@@
-132,8
+136,9
@@
void pl_frame_limit(void)
if (tv.tv_sec != oldsec) {
flips_per_sec = flip_cnt;
flip_cnt = 0;
if (tv.tv_sec != oldsec) {
flips_per_sec = flip_cnt;
flip_cnt = 0;
- tick_per_sec = get_cpu_ticks();
oldsec = tv.tv_sec;
oldsec = tv.tv_sec;
+ if (g_opts & OPT_SHOWCPU)
+ tick_per_sec = get_cpu_ticks();
}
#ifdef PCNT
static int ya_vsync_count;
}
#ifdef PCNT
static int ya_vsync_count;