gpu_neon: merge cmd size tables

[pcsx_rearmed.git] / plugins / gpu_neon / vout_fb.c

diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c
index fdcfd51..20c8ff3 100644 (file)
--- a/plugins/gpu_neon/vout_fb.c
+++ b/plugins/gpu_neon/vout_fb.c
@@ -10,7 +10,7 @@
 
 #include "gpu.h"
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/arm_utils.h"
+#include "../../frontend/cspace.h"
 
 static const struct rearmed_cbs *cbs;
 static void *screen_buf;
@@ -25,28 +25,34 @@ int vout_finish(void)
   return 0;
 }
 
+static void check_mode_change(void)
+{
+  static uint32_t old_status;
+  static int old_h;
+
+  // width|rgb24 change?
+  if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || gpu.screen.h != old_h)
+  {
+    old_status = gpu.status.reg;
+    old_h = gpu.screen.h;
+    screen_buf = cbs->pl_vout_set_mode(gpu.screen.hres,
+                                       gpu.screen.h, gpu.status.rgb24 ? 24 : 16);
+  }
+}
+
 static void blit(void)
 {
-  static uint32_t old_status, old_h;
   int x = gpu.screen.x & ~1; // alignment needed by blitter
   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 doffs;
-  uint16_t *srcs;
-  uint8_t  *dest;
+  int fb_offs, doffs;
+  uint8_t *dest;
 
-  srcs = &gpu.vram[y * 1024 + x];
-
-  if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change?
-  {
-    old_status = gpu.status.reg;
-    old_h = h;
-    screen_buf = cbs->pl_fbdev_set_mode(stride, h, gpu.status.rgb24 ? 24 : 16);
-  }
-
-  dest = screen_buf;
+  fb_offs = y * 1024 + x;
+  dest = (uint8_t *)screen_buf;
 
   // only do centering, at least for now
   doffs = (stride - w) / 2 & ~1;
@@ -55,50 +61,59 @@ static void blit(void)
   {
 #ifndef MAEMO
     dest += (doffs / 8) * 24;
-    for (; h-- > 0; dest += stride * 3, srcs += 1024)
+    for (; h-- > 0; dest += stride * 3, fb_offs += 1024)
     {
-      bgr888_to_rgb888(dest, srcs, w * 3);
+      fb_offs &= 1024*512-1;
+      bgr888_to_rgb888(dest, vram + fb_offs, w * 3);
     }
 #else
     dest += doffs * 2;
-    for (; h-- > 0; dest += stride * 2, srcs += 1024)
+    for (; h-- > 0; dest += stride * 2, fb_offs += 1024)
     {
-      bgr888_to_rgb565(dest, srcs, w * 3);
+      fb_offs &= 1024*512-1;
+      bgr888_to_rgb565(dest, vram + fb_offs, w * 3);
     }
 #endif
   }
   else
   {
     dest += doffs * 2;
-    for (; h-- > 0; dest += stride * 2, srcs += 1024)
+    for (; h-- > 0; dest += stride * 2, fb_offs += 1024)
     {
-      bgr555_to_rgb565(dest, srcs, w * 2);
+      fb_offs &= 1024*512-1;
+      bgr555_to_rgb565(dest, vram + fb_offs, w * 2);
     }
   }
 
-  screen_buf = cbs->pl_fbdev_flip();
+  screen_buf = cbs->pl_vout_flip();
 }
 
-void GPUupdateLace(void)
+void vout_update(void)
 {
-  if (!gpu.status.blanking)
+  check_mode_change();
+  if (cbs->pl_vout_raw_flip)
+    cbs->pl_vout_raw_flip(gpu.screen.x, gpu.screen.y);
+  else
     blit();
 }
 
-long GPUopen(void)
+long GPUopen(void **unused)
 {
-  cbs->pl_fbdev_open();
-  screen_buf = cbs->pl_fbdev_flip();
+  gpu.frameskip.active = 0;
+  gpu.frameskip.frame_ready = 1;
+
+  cbs->pl_vout_open();
+  screen_buf = cbs->pl_vout_flip();
   return 0;
 }
 
 long GPUclose(void)
 {
-  cbs->pl_fbdev_close();
+  cbs->pl_vout_close();
   return 0;
 }
 
-void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
+void vout_set_config(const struct rearmed_cbs *cbs_)
 {
   cbs = cbs_;
 }