X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fdraw_fb.c;h=64657bb2a3180fa106eed69be066045f70977102;hp=ce3f51541e0fab5a78db22764cb7cedb40bfef47;hb=6d1a1ac2f1100c69dd3e1084aede6646d6c48f1e;hpb=14dffdb7a0457fc647103deafa5f1cac12e888fb

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index ce3f5154..64657bb2 100644
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -16,6 +16,7 @@
 #include "swap.h"
 
 #include "plugin_lib.h"
+#include "pcnt.h"
 
 // misc globals
 int            iResX;
@@ -36,62 +37,73 @@ PSXPoint_t     ptCursorPoint[8];
 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;
- int y = PSXDisplay.DisplayPosition.y;
+ extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
+ extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
+ int px = PSXDisplay.DisplayPosition.x & ~3; // XXX: align needed by bgr*_to_...
+ int py = 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 + py * 1024 + px;
  unsigned char *dest = pl_fbdev_buf;
 
- // TODO: clear border if centering
+ 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
+ dest += (PreviousPSXDisplay.Range.x0 & ~3) * 2; // must align here too..
 
+ if (PSXDisplay.RGB24)
  {
-   unsigned short *srcs = psxVuw + y * 1024 + x;
    for (; h-- > 0; dest += pitch, srcs += 1024)
    {
-     memcpy(dest, srcs, w * 2);
+     bgr888_to_rgb888(dest, srcs, w * 3);
+   }
+ }
+ else
+ {
+   for (; h-- > 0; dest += pitch, srcs += 1024)
+   {
+     bgr555_to_rgb565(dest, srcs, w * 2);
    }
  }
 }
 
-static int fbw, fbh, fb24bpp;
-
-#include "pcnt.h"
-
 void DoBufferSwap(void)
 {
- static int fps_counter;
- if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
+ static int fbw, fbh, fb24bpp;
+
+ if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)
   return;
 
- if (PSXDisplay.DisplayMode.x != fbw || PSXDisplay.DisplayMode.y != fbh
+ /* careful if rearranging this code, we try to set mode and flip
+  * to get the hardware apply both changes at the same time */
+ if (PreviousPSXDisplay.DisplayMode.x != fbw || PreviousPSXDisplay.DisplayMode.y != fbh
      || PSXDisplay.RGB24 != fb24bpp) {
-  fbw = PSXDisplay.DisplayMode.x;
-  fbh = PSXDisplay.DisplayMode.y;
+  fbw = PreviousPSXDisplay.DisplayMode.x;
+  fbh = PreviousPSXDisplay.DisplayMode.y;
   fb24bpp = PSXDisplay.RGB24;
   pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
  }
 
+ pcnt_start(PCNT_BLIT);
  blit();
- pl_fbdev_flip();
+ pcnt_end(PCNT_BLIT);
 
- 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);
+ pl_fbdev_flip();
 }
 
 void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
@@ -125,7 +137,7 @@ unsigned long ulInitDisplay(void)
  iShowFPS=1;
  initialize();
 
- if (pl_fbdev_init() != 0)
+ if (pl_fbdev_open() != 0)
   return 0;
 
  return 1; /* ok */
@@ -134,7 +146,7 @@ unsigned long ulInitDisplay(void)
 void CloseDisplay(void)
 {
  CloseMenu();
- pl_fbdev_finish();
+ pl_fbdev_close();
  //WriteConfig();
 }