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 f3d0cf2..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,9 +37,6 @@ PSXPoint_t     ptCursorPoint[8];
 unsigned short usCursorActive = 0;
 char *         pCaptionText;
 
 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
 #ifndef __arm__
 #define bgr555_to_rgb565 memcpy
 #define bgr888_to_rgb888 memcpy


@@ -48,25 +46,25 @@ 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);
 {
  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 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;
  int w = PreviousPSXDisplay.Range.x1;
  int h = PreviousPSXDisplay.DisplayMode.y;
  int pitch = PreviousPSXDisplay.DisplayMode.x;

- unsigned short *srcs = psxVuw + y * 1024 + x;
+ unsigned short *srcs = psxVuw + py * 1024 + px;

  unsigned char *dest = pl_fbdev_buf;
 
  if (w <= 0)
    return;
 
  unsigned char *dest = pl_fbdev_buf;
 
  if (w <= 0)
    return;
 

- // TODO: clear border if centering
+ // TODO: clear border if centering?

 
  pitch *= PSXDisplay.RGB24 ? 3 : 2;
 
  // account for centering
  h -= PreviousPSXDisplay.Range.y0;
  dest += PreviousPSXDisplay.Range.y0 / 2 * pitch;
 
  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)
  {
 
  if (PSXDisplay.RGB24)
  {


@@ -81,48 +79,31 @@ static void blit(void)
    {
      bgr555_to_rgb565(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);

  }
 }
 
  }
 }
 

-#include "pcnt.h"
-

 void DoBufferSwap(void)
 {
 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;
 
   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);
  }
 

+ pcnt_start(PCNT_BLIT);

  blit();
  blit();

- pl_fbdev_flip();
-
- pcnt_end(PCNT_ALL);
+ pcnt_end(PCNT_BLIT);

 
 

- {
-  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);
+ pl_fbdev_flip();

 }
 
 void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
 }
 
 void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER


@@ -156,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 */


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

- pl_fbdev_finish();
+ pl_fbdev_close();

  //WriteConfig();
 }
 
  //WriteConfig();
 }