standalone: revive spu_c64x build

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 2339028..1cbfdb0 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -134,7 +134,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
 
        static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
        unsigned short *dest = (unsigned short *)pl_vout_buf +
-               vout_w * (vout_h - HUD_HEIGHT) + vout_w / 2 - 192/2;
+               pl_vout_w * (vout_h - HUD_HEIGHT) + pl_vout_w / 2 - 192/2;
        unsigned short *d, p;
        int c, x, y;
 
@@ -149,7 +149,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
                     (fmod_chans & (1<<c)) ? 0xf000 :
                     (noise_chans & (1<<c)) ? 0x001f :
                     colors[c & 1];
-               for (y = 0; y < 8; y++, d += vout_w)
+               for (y = 0; y < 8; y++, d += pl_vout_w)
                        for (x = 0; x < 8; x++)
                                d[x] = p;
        }
@@ -227,12 +227,12 @@ static void update_layer_size(int w, int h)
                break;
        }
 
-       g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
-       g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
-       if (g_layer_x < 0) g_layer_x = 0;
-       if (g_layer_y < 0) g_layer_y = 0;
-       if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
-       if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+       if (g_scaler != SCALE_CUSTOM) {
+               g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+               g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+       }
+       if (g_layer_w > g_menuscreen_w * 2) g_layer_w = g_menuscreen_w * 2;
+       if (g_layer_h > g_menuscreen_h * 2) g_layer_h = g_menuscreen_h * 2;
 }
 
 // XXX: this is platform specific really
@@ -302,10 +302,16 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
        menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp);
 }
 
+static int flip_clear_counter;
+
+void pl_force_clear(void)
+{
+       flip_clear_counter = 2;
+}
+
 static void pl_vout_flip(const void *vram, int stride, int bgr24,
        int x, int y, int w, int h, int dims_changed)
 {
-       static int clear_counter;
        unsigned char *dest = pl_vout_buf;
        const unsigned short *src = vram;
        int dstride = pl_vout_w, h1 = h;
@@ -332,15 +338,15 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24,
        doffs = xoffs + y * dstride;
 
        if (dims_changed)
-               clear_counter = 2;
+               flip_clear_counter = 3;
 
-       if (clear_counter > 0) {
+       if (flip_clear_counter > 0) {
                if (pl_plat_clear)
                        pl_plat_clear();
                else
                        memset(pl_vout_buf, 0,
                                dstride * h_full * pl_vout_bpp / 8);
-               clear_counter--;
+               flip_clear_counter--;
        }
 
        if (pl_plat_blit)
@@ -385,17 +391,21 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24,
        }
        else if (scanlines != 0 && scanline_level != 100)
        {
-               int l = scanline_level * 2048 / 100;
+               int h2, l = scanline_level * 2048 / 100;
                int stride_0 = pl_vout_scale_h >= 2 ? 0 : stride;
 
                h1 *= pl_vout_scale_h;
-               for (; h1 >= 2; h1 -= 2)
+               while (h1 > 0)
                {
-                       bgr555_to_rgb565(dest, src, w * 2);
-                       dest += dstride * 2, src += stride_0;
+                       for (h2 = scanlines; h2 > 0 && h1 > 0; h2--, h1--) {
+                               bgr555_to_rgb565(dest, src, w * 2);
+                               dest += dstride * 2, src += stride_0;
+                       }
 
-                       bgr555_to_rgb565_b(dest, src, w * 2, l);
-                       dest += dstride * 2, src += stride;
+                       for (h2 = scanlines; h2 > 0 && h1 > 0; h2--, h1--) {
+                               bgr555_to_rgb565_b(dest, src, w * 2, l);
+                               dest += dstride * 2, src += stride;
+                       }
                }
        }
 #endif