X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_neon%2Fvout_fb.c;h=394f6a3b6bd5ee204ce24c405881d7efd493f3cb;hp=bda8d4a690309b7fc4483c574a8a2d1ab2ec6c30;hb=a3a9f519f75d195891d466f77ceb43f90e24f713;hpb=a80ae4a0353fce94df700ec84222d3c56c3d813a

diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c
index bda8d4a6..394f6a3b 100644
--- a/plugins/gpu_neon/vout_fb.c
+++ b/plugins/gpu_neon/vout_fb.c
@@ -27,17 +27,18 @@ int vout_finish(void)
 
 static void blit(void)
 {
-  static uint32_t old_status, old_h;
+  static uint32_t old_status;
+  static int 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];
+  fb_offs = y * 1024 + x;
 
   if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change?
   {
@@ -46,7 +47,7 @@ static void blit(void)
     screen_buf = cbs->pl_vout_set_mode(stride, h, gpu.status.rgb24 ? 24 : 16);
   }
 
-  dest = screen_buf;
+  dest = (uint8_t *)screen_buf;
 
   // only do centering, at least for now
   doffs = (stride - w) / 2 & ~1;
@@ -55,24 +56,27 @@ 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);
     }
   }
 
@@ -121,6 +125,8 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
   gpu.frameskip.advice = &cbs->fskip_advice;
   gpu.frameskip.active = 0;
   gpu.frameskip.frame_ready = 1;
+  gpu.state.hcnt = cbs->gpu_hcnt;
+  gpu.state.frame_count = cbs->gpu_frame_count;
 }
 
 // vim:shiftwidth=2:expandtab