check for height changes too

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

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index f3d0cf2..5884f92 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 "pcnt.h"
 
 // misc globals
 int            iResX;
@@ -36,9 +37,6 @@ 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
@@ -48,7 +46,7 @@ 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);
- int x = PSXDisplay.DisplayPosition.x;
+ 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;
@@ -81,18 +79,18 @@ static void blit(void)
    {
      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)
 {
- static int fps_counter;
+ static int fbw, fbh, fb24bpp;
+
  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;
@@ -101,28 +99,11 @@ void DoBufferSwap(void)
   pl_fbdev_set_mode(fbw, fbh, fb24bpp ? 24 : 16);
  }
 
+ pcnt_start(PCNT_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