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
gpu_neon: fix linkage for c++ code (una-i)
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
0e69743
..
eba09fb
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-24,6
+24,7
@@
#include "omap.h"
#include "menu.h"
#include "main.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 "pcnt.h"
#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
@@
-209,11
+210,15
@@
static void pl_vout_close(void)
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
+#if defined(VOUT_FBDEV)
*w = pl_vout_w;
*h = pl_vout_h;
*bpp = pl_vout_bpp;
return pl_vout_buf;
*w = pl_vout_w;
*h = pl_vout_h;
*bpp = pl_vout_bpp;
return pl_vout_buf;
+#else
+ return plat_prepare_screenshot(w, h, bpp);
+#endif
}
static void update_input(void)
}
static void update_input(void)
@@
-470,8
+475,14
@@
void pl_start_watchdog(void)
void pl_init(void)
{
void pl_init(void)
{
+ extern unsigned int hSyncCount; // from psxcounters
+ extern unsigned int frame_counter;
+
pl_vout_w = pl_vout_h = 256;
pl_vout_bpp = 16;
tsdev = pl_gun_ts_init();
pl_vout_w = pl_vout_h = 256;
pl_vout_bpp = 16;
tsdev = pl_gun_ts_init();
+
+ pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
+ pl_rearmed_cbs.gpu_frame_count = &frame_counter;
}
}