X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpulib%2Fvout_pl.c;h=a9437cb145cb5ba9f53589cead83a38e8657070c;hp=cbd80349f6d99ea0a4a260c56283dc47ad18afad;hb=HEAD;hpb=e929dec505f8d3692248fe0d42c84a37c994ad39

diff --git a/plugins/gpulib/vout_pl.c b/plugins/gpulib/vout_pl.c
index cbd80349..80389a34 100644
--- a/plugins/gpulib/vout_pl.c
+++ b/plugins/gpulib/vout_pl.c
@@ -11,11 +11,9 @@
 
 #include <string.h>
 #include "gpu.h"
-#include "cspace.h"
 #include "../../frontend/plugin_lib.h"
 
 static const struct rearmed_cbs *cbs;
-static void *screen_buf;
 
 int vout_init(void)
 {
@@ -27,124 +25,118 @@ int vout_finish(void)
   return 0;
 }
 
-static void check_mode_change(void)
+static void check_mode_change(int force)
 {
-  static uint32_t old_status;
-  static int old_h;
   int w = gpu.screen.hres;
-  int h = gpu.screen.h;
-
+  int h = gpu.screen.vres;
+  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.enhancement_bufer != NULL && gpu.state.enhancement_enable
-    && w <= 512 && h <= 256 && !gpu.status.rgb24;
+    gpu.get_enhancement_bufer != NULL && gpu.state.enhancement_enable
+    && w <= 512 && h <= 256 && !(gpu.status & PSX_GPU_STATUS_RGB24);
 
   if (gpu.state.enhancement_active) {
-    w *= 2;
-    h *= 2;
+    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 ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h)
+  if (force || (gpu.status ^ gpu.state.status_vo_old) & ((7<<16)|(1<<21))
+      || w_out != gpu.state.w_out_old || h_out != gpu.state.h_out_old)
   {
-    old_status = gpu.status.reg;
-    old_h = h;
+    gpu.state.status_vo_old = gpu.status;
+    gpu.state.w_out_old = w_out;
+    gpu.state.h_out_old = h_out;
 
-    screen_buf = cbs->pl_vout_set_mode(w, h,
-      (gpu.status.rgb24 && !cbs->only_16bpp) ? 24 : 16);
+    if (w_out != 0 && h_out != 0)
+      cbs->pl_vout_set_mode(w_out, h_out, w, h, bpp);
   }
 }
 
-static void blit(void)
+void vout_update(void)
 {
-  int x = gpu.screen.x & ~1; // alignment needed by blitter
+  int bpp = (gpu.status & PSX_GPU_STATUS_RGB24) ? 24 : 16;
+  uint8_t *vram = (uint8_t *)gpu.vram;
+  int src_x = gpu.screen.src_x;
+  int src_y = gpu.screen.src_y;
+  int x = gpu.screen.x;
   int y = gpu.screen.y;
   int w = gpu.screen.w;
   int h = gpu.screen.h;
-  uint16_t *vram = gpu.vram;
-  int stride = gpu.screen.hres;
-  int vram_stride = 1024;
-  int vram_mask = 1024 * 512 - 1;
-  int fb_offs, doffs;
-  uint8_t *dest;
-
-  dest = (uint8_t *)screen_buf;
-  if (dest == NULL || w == 0 || stride == 0)
+  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; }
+
+  if (w <= 0 || h <= 0)
     return;
 
+  check_mode_change(0);
   if (gpu.state.enhancement_active) {
-    // this layout is gpu_neon specific..
-    vram = gpu.enhancement_bufer +
-      (x + 8) / stride * 1024 * 1024;
-    x *= 2;
-    y *= 2;
-    w *= 2;
-    h *= 2;
-    stride *= 2;
-    vram_mask = 1024 * 1024 - 1;
+    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;
   }
-  fb_offs = y * vram_stride + x;
-
-  // only do centering, at least for now
-  doffs = (stride - w) / 2 & ~1;
 
-  if (gpu.status.rgb24)
-  {
-    if (cbs->only_16bpp) {
-      dest += doffs * 2;
-      for (; h-- > 0; dest += stride * 2, fb_offs += vram_stride)
-      {
-        fb_offs &= vram_mask;
-        bgr888_to_rgb565(dest, vram + fb_offs, w * 3);
-      }
-    }
-    else {
-      dest += (doffs / 8) * 24;
-      for (; h-- > 0; dest += stride * 3, fb_offs += vram_stride)
-      {
-        fb_offs &= vram_mask;
-        bgr888_to_rgb888(dest, vram + fb_offs, w * 3);
-      }
-    }
-  }
-  else
-  {
-    dest += doffs * 2;
-    for (; h-- > 0; dest += stride * 2, fb_offs += vram_stride)
-    {
-      fb_offs &= vram_mask;
-      bgr555_to_rgb565(dest, vram + fb_offs, w * 2);
+  if (src_y + h > vram_h) {
+    if (src_y + h - vram_h > h / 2) {
+      // wrap
+      h -= vram_h - src_y;
+      src_y = 0;
     }
+    else
+      // clip
+      h = vram_h - src_y;
   }
 
-  screen_buf = cbs->pl_vout_flip();
-}
+  vram += (src_y * 1024 + src_x) * 2;
+  vram += src_x2 * bpp / 8;
 
-void vout_update(void)
-{
-  check_mode_change();
-  if (cbs->pl_vout_raw_flip)
-    cbs->pl_vout_raw_flip(gpu.screen.x, gpu.screen.y);
-  else
-    blit();
+  cbs->pl_vout_flip(vram, 1024, !!(gpu.status & PSX_GPU_STATUS_RGB24),
+      x, y, w, h, gpu.state.dims_changed);
+  gpu.state.dims_changed = 0;
 }
 
 void vout_blank(void)
 {
-  check_mode_change();
-  if (cbs->pl_vout_raw_flip == NULL) {
-    int bytespp = gpu.status.rgb24 ? 3 : 2;
-    memset(screen_buf, 0, gpu.screen.hres * gpu.screen.h * bytespp);
-    screen_buf = cbs->pl_vout_flip();
+  int w = gpu.screen.hres;
+  int h = gpu.screen.vres;
+
+  check_mode_change(0);
+  if (gpu.state.enhancement_active) {
+    w *= 2;
+    h *= 2;
   }
+  cbs->pl_vout_flip(NULL, 1024, !!(gpu.status & PSX_GPU_STATUS_RGB24), 0, 0, w, h, 0);
 }
 
-long GPUopen(void **unused)
+long GPUopen(unsigned long *disp, char *cap, char *cfg)
 {
   gpu.frameskip.active = 0;
   gpu.frameskip.frame_ready = 1;
 
   cbs->pl_vout_open();
-  screen_buf = cbs->pl_vout_flip();
+  check_mode_change(1);
+  vout_update();
   return 0;
 }