cdrom: change pause timing again

[pcsx_rearmed.git] / plugins / gpulib / vout_pl.c

diff --git a/plugins/gpulib/vout_pl.c b/plugins/gpulib/vout_pl.c
index cae35a3..80389a3 100644 (file)
--- a/plugins/gpulib/vout_pl.c
+++ b/plugins/gpulib/vout_pl.c
@@ -29,9 +29,14 @@ static void check_mode_change(int force)
 {
   int w = gpu.screen.hres;
   int h = gpu.screen.vres;
-  int w_out = w;
-  int h_out = h;
-
+  int w_out, h_out, bpp = 16;
+
+  if (gpu.state.screen_centering_type == C_BORDERLESS)
+    h = gpu.screen.h;
+  w_out = w, h_out = h;
+#ifdef RAW_FB_DISPLAY
+  w = w_out = 1024, h = h_out = 512;
+#endif
   gpu.state.enhancement_active =
     gpu.get_enhancement_bufer != NULL && gpu.state.enhancement_enable
     && w <= 512 && h <= 256 && !(gpu.status & PSX_GPU_STATUS_RGB24);
@@ -40,6 +45,11 @@ static void check_mode_change(int force)
     w_out *= 2;
     h_out *= 2;
   }
+  if (gpu.status & PSX_GPU_STATUS_RGB24) {
+    // some asm relies on this alignment
+    w_out = (w_out + 7) & ~7;
+    bpp = 24;
+  }
 
   // width|rgb24 change?
   if (force || (gpu.status ^ gpu.state.status_vo_old) & ((7<<16)|(1<<21))
@@ -49,8 +59,8 @@ static void check_mode_change(int force)
     gpu.state.w_out_old = w_out;
     gpu.state.h_out_old = h_out;
 
-    cbs->pl_vout_set_mode(w_out, h_out, w, h,
-          (gpu.status & PSX_GPU_STATUS_RGB24) ? 24 : 16);
+    if (w_out != 0 && h_out != 0)
+      cbs->pl_vout_set_mode(w_out, h_out, w, h, bpp);
   }
 }
 
@@ -67,6 +77,9 @@ void vout_update(void)
   int vram_h = 512;
   int src_x2 = 0;
 
+#ifdef RAW_FB_DISPLAY
+  w = 1024, h = 512, x = src_x = y = src_y = 0;
+#endif
   if (x < 0) { w += x; src_x2 = -x; x = 0; }
   if (y < 0) { h += y; src_y -=  y; y = 0; }
 
@@ -78,6 +91,8 @@ void vout_update(void)
     if (!gpu.state.enhancement_was_active)
       return; // buffer not ready yet
     vram = gpu.get_enhancement_bufer(&src_x, &src_y, &w, &h, &vram_h);
+    if (vram == NULL)
+      return;
     x *= 2; y *= 2;
     src_x2 *= 2;
   }