X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fdfxvideo%2Fdraw_fb.c;h=b39e2ee6ab1592ea7c9135fe3c0c28d49c8a9bcd;hb=d352cde27e89b1be21bf8f88c3ca79e0eb497165;hp=39be291c1f95d2cbdeb15c9f9d858dcd22f12bfb;hpb=b60f2812208aa36dc8b9e8e90f02b608dafd0c00;p=pcsx_rearmed.git

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index 39be291c..b39e2ee6 100644
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -36,40 +36,65 @@ PSXPoint_t     ptCursorPoint[8];
 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)
 {
- 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);
    }
+   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)
 {
- static float fps_old;
+ static int fps_counter;
  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;
@@ -78,13 +103,28 @@ 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);
+
+ {
+  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) {
+  pcnt_print(fps_cur);
+  fps_counter = 0;
+ }
+
+ pcnt_start(PCNT_ALL);
 }
 
 void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
@@ -128,6 +168,7 @@ void CloseDisplay(void)
 {
  CloseMenu();
  pl_fbdev_finish();
+ //WriteConfig();
 }
 
 void CreatePic(unsigned char * pMem)