simple neon BGR555 to RGB565 converter

[pcsx_rearmed.git] / plugins / dfxvideo / draw_fb.c

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index 39be291..e251071 100644 (file)
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -36,9 +36,13 @@ PSXPoint_t     ptCursorPoint[8];
 unsigned short usCursorActive = 0;
 char *         pCaptionText;
 
+#ifndef __arm__
+#define bgr555_to_rgb565 memcpy
+#endif
 
 static void blit(void)
 {
+ extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
  int x = PSXDisplay.DisplayPosition.x;
  int y = PSXDisplay.DisplayPosition.y;
  int w = PreviousPSXDisplay.Range.x1;
@@ -46,6 +50,9 @@ static void blit(void)
  int pitch = PreviousPSXDisplay.DisplayMode.x * 2;
  unsigned char *dest = pl_fbdev_buf;
 
+ if (w <= 0)
+   return;
+
  // TODO: clear border if centering
 
  // account for centering
@@ -57,16 +64,18 @@ static void blit(void)
    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;
 
+#include "pcnt.h"
+
 void DoBufferSwap(void)
 {
- static float fps_old;
+ static int fps_counter;
  if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
   return;
 
@@ -78,13 +87,18 @@ void DoBufferSwap(void)
   pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
  }
 
- if (fps_cur != fps_old) {
-  printf("%2.1f\n", fps_cur);
-  fps_old = fps_cur;
- }
-
  blit();
  pl_fbdev_flip();
+
+ pcnt_end(PCNT_ALL);
+
+ if (++fps_counter == 60/6) {
+  //printf("%2.1f\n", fps_cur);
+  pcnt_print(fps_cur);
+  fps_counter = 0;
+ }
+
+ pcnt_start(PCNT_ALL);
 }
 
 void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
@@ -128,6 +142,7 @@ void CloseDisplay(void)
 {
  CloseMenu();
  pl_fbdev_finish();
+ //WriteConfig();
 }
 
 void CreatePic(unsigned char * pMem)