#include "swap.h"
#include "plugin_lib.h"
+#include "pcnt.h"
// misc globals
int iResX;
unsigned short usCursorActive = 0;
char * pCaptionText;
+#ifndef __arm__
+#define bgr555_to_rgb565 memcpy
+#define bgr888_to_rgb888 memcpy
+#endif
static void blit(void)
{
- int x = PSXDisplay.DisplayPosition.x;
+ extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
+ extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
+ int x = PSXDisplay.DisplayPosition.x & ~3; // XXX: align needed by bgr*_to_...
int y = PSXDisplay.DisplayPosition.y;
int w = PreviousPSXDisplay.Range.x1;
int h = PreviousPSXDisplay.DisplayMode.y;
- int pitch = PreviousPSXDisplay.DisplayMode.x * 2;
+ int pitch = PreviousPSXDisplay.DisplayMode.x;
+ unsigned short *srcs = psxVuw + y * 1024 + x;
unsigned char *dest = pl_fbdev_buf;
+ if (w <= 0)
+ return;
+
// TODO: clear border if centering
+ pitch *= PSXDisplay.RGB24 ? 3 : 2;
+
// account for centering
h -= PreviousPSXDisplay.Range.y0;
dest += PreviousPSXDisplay.Range.y0 / 2 * pitch;
dest += PreviousPSXDisplay.Range.x0 * 2; // XXX
+ if (PSXDisplay.RGB24)
+ {
+ for (; h-- > 0; dest += pitch, srcs += 1024)
+ {
+ bgr888_to_rgb888(dest, srcs, w * 3);
+ }
+ }
+ else
{
- unsigned short *srcs = psxVuw + y * 1024 + x;
for (; h-- > 0; dest += pitch, srcs += 1024)
{
- memcpy(dest, srcs, w * 2);
+ bgr555_to_rgb565(dest, srcs, w * 2);
}
}
}
-static int fbw, fbh, fb24bpp;
-
void DoBufferSwap(void)
{
- static float fps_old;
+ static int fbw, fbh, fb24bpp;
+
if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
return;
+ /* careful if rearranging this code, we try to set mode and flip
+ * to get the hardware apply both changes at the same time */
if (PSXDisplay.DisplayMode.x != fbw || PSXDisplay.DisplayMode.y != fbh
|| PSXDisplay.RGB24 != fb24bpp) {
fbw = PSXDisplay.DisplayMode.x;
pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
}
- if (fps_cur != fps_old) {
- printf("%2.1f\n", fps_cur);
- fps_old = fps_cur;
- }
-
+ pcnt_start(PCNT_BLIT);
blit();
+ pcnt_end(PCNT_BLIT);
+
pl_fbdev_flip();
}
{
CloseMenu();
pl_fbdev_finish();
+ //WriteConfig();
}
void CreatePic(unsigned char * pMem)