libretro: update for newer spu code

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index dfff868..72b3395 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -28,10 +28,10 @@
 #include "plat.h"
 #include "pcnt.h"
 #include "pl_gun_ts.h"
+#include "cspace.h"
 #include "psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../libpcsxcore/psxmem_map.h"
-#include "../plugins/gpulib/cspace.h"
 #include "../plugins/dfinput/externals.h"
 
 int in_type1, in_type2;
@@ -240,9 +240,12 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 
        psx_w = raw_w;
        psx_h = raw_h;
+       psx_bpp = bpp;
        vout_w = w;
        vout_h = h;
-       vout_bpp = psx_bpp = bpp;
+       vout_bpp = bpp;
+       if (pl_rearmed_cbs.only_16bpp)
+               vout_bpp = 16;
 
        // don't use very low heights
        if (vout_h < 192) {
@@ -270,7 +273,7 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
        pl_vout_buf = plat_gvideo_set_mode(&vout_w, &vout_h, &vout_bpp);
        if (pl_vout_buf == NULL && pl_plat_blit == NULL)
                fprintf(stderr, "failed to set mode %dx%d@%d\n",
-                       vout_w, vout_h, psx_bpp);
+                       vout_w, vout_h, vout_bpp);
        else {
                pl_vout_w = vout_w;
                pl_vout_h = vout_h;
@@ -579,9 +582,7 @@ static void update_input(void)
        in_keystate = actions[IN_BINDTYPE_PLAYER12];
 }
 #else /* MAEMO */
-static void update_input(void)
-{
-}
+extern void update_input(void);
 #endif
 
 void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
@@ -606,7 +607,7 @@ void pl_frame_limit(void)
        struct timeval now;
        int diff, usadj;
 
-       if (g_resetting)
+       if (g_emu_resetting)
                return;
 
        vsync_cnt++;