unsigned short usCursorActive = 0;
char * pCaptionText;
+static int fbw, fbh, fb24bpp;
+static int flip_cnt, flips_per_sec;
+
+#ifndef __arm__
+#define bgr555_to_rgb565 memcpy
+#define bgr888_to_rgb888 memcpy
+#endif
static void blit(void)
{
+ 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;
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);
}
+ pl_text_out16(2, fbh - 10, "%2d %2.1f", flips_per_sec, fps_cur);
}
}
-static int fbw, fbh, fb24bpp;
-
#include "pcnt.h"
void DoBufferSwap(void)
pcnt_end(PCNT_ALL);
+ {
+ static int oldsec;
+ struct timeval tv;
+ flip_cnt++;
+ gettimeofday(&tv, 0);
+ if (tv.tv_sec != oldsec) {
+ flips_per_sec = flip_cnt;
+ flip_cnt = 0;
+ oldsec = tv.tv_sec;
+ }
+ }
if (++fps_counter == 60/6) {
- //printf("%2.1f\n", fps_cur);
pcnt_print(fps_cur);
fps_counter = 0;
}