move layer control to plugin/plugin_lib

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

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index 39be291..64657bb 100644 (file)
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -16,6 +16,7 @@
 #include "swap.h"
 
 #include "plugin_lib.h"
 #include "swap.h"
 
 #include "plugin_lib.h"

+#include "pcnt.h"

 
 // misc globals
 int            iResX;
 
 // misc globals
 int            iResX;


@@ -36,54 +37,72 @@ PSXPoint_t     ptCursorPoint[8];
 unsigned short usCursorActive = 0;
 char *         pCaptionText;
 
 unsigned short usCursorActive = 0;
 char *         pCaptionText;
 

+#ifndef __arm__
+#define bgr555_to_rgb565 memcpy
+#define bgr888_to_rgb888 memcpy
+#endif

 
 static void blit(void)
 {
 
 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 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;
 
  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;
 
  // 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)
+ {
+   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)
    {
    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)
 {
 void DoBufferSwap(void)
 {

- static float fps_old;
- if (PSXDisplay.DisplayMode.x == 0 || PSXDisplay.DisplayMode.y == 0)
+ static int fbw, fbh, fb24bpp;
+
+ if (PreviousPSXDisplay.DisplayMode.x == 0 || PreviousPSXDisplay.DisplayMode.y == 0)

   return;
 
   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) {
      || 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);
  }
 
   fb24bpp = PSXDisplay.RGB24;
   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();
  blit();

+ pcnt_end(PCNT_BLIT);
+

  pl_fbdev_flip();
 }
 
  pl_fbdev_flip();
 }
 


@@ -118,7 +137,7 @@ unsigned long ulInitDisplay(void)
  iShowFPS=1;
  initialize();
 
  iShowFPS=1;
  initialize();
 

- if (pl_fbdev_init() != 0)
+ if (pl_fbdev_open() != 0)

   return 0;
 
  return 1; /* ok */
   return 0;
 
  return 1; /* ok */


@@ -127,7 +146,8 @@ unsigned long ulInitDisplay(void)
 void CloseDisplay(void)
 {
  CloseMenu();
 void CloseDisplay(void)
 {
  CloseMenu();

- pl_fbdev_finish();
+ pl_fbdev_close();
+ //WriteConfig();

 }
 
 void CreatePic(unsigned char * pMem)
 }
 
 void CreatePic(unsigned char * pMem)