psx_gpu: select buffers differently

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

diff --git a/plugins/gpu_neon/psx_gpu_if.c b/plugins/gpu_neon/psx_gpu_if.c
index 1b4dcc5..62c4f9e 100644 (file)
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -41,7 +41,7 @@ int do_cmd_list(uint32_t *list, int count, int *last_cmd)
   return ret;
 }
 
   return ret;
 }
 

-#define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096)
+#define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096 * 2)

 
 static void map_enhancement_buffer(void)
 {
 
 static void map_enhancement_buffer(void)
 {


@@ -51,6 +51,8 @@ static void map_enhancement_buffer(void)
   gpu.enhancement_bufer = gpu.mmap(ENHANCEMENT_BUF_SIZE);
   if (gpu.enhancement_bufer == NULL)
     fprintf(stderr, "failed to map enhancement buffer\n");
   gpu.enhancement_bufer = gpu.mmap(ENHANCEMENT_BUF_SIZE);
   if (gpu.enhancement_bufer == NULL)
     fprintf(stderr, "failed to map enhancement buffer\n");

+  else
+    gpu.enhancement_bufer += 4096 / 2;

   egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
 }
 
   egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
 }
 


@@ -70,42 +72,41 @@ int renderer_init(void)
 
 void renderer_finish(void)
 {
 
 void renderer_finish(void)
 {

-  if (gpu.enhancement_bufer != NULL)
+  if (gpu.enhancement_bufer != NULL) {
+    gpu.enhancement_bufer -= 4096 / 2;

     gpu.munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);
     gpu.munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);

+  }

   gpu.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;
   gpu.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;

+  egpu.enhancement_current_buf_ptr = NULL;

   initialized = 0;
 }
 
 static __attribute__((noinline)) void
 sync_enhancement_buffers(int x, int y, int w, int h)
 {
   initialized = 0;
 }
 
 static __attribute__((noinline)) void
 sync_enhancement_buffers(int x, int y, int w, int h)
 {

-  int xt = egpu.enhancement_x_threshold;
+  const int step_x = 1024 / sizeof(egpu.enhancement_buf_by_x16);

   u16 *src, *dst;
   u16 *src, *dst;

-  int wb, i;
+  int w1, fb_index;

 
 

-  w += x & 7;
-  x &= ~7;
-  w = (w + 7) & ~7;
+  w += x & (step_x - 1);
+  x &= ~(step_x - 1);
+  w = (w + step_x - 1) & ~(step_x - 1);

   if (y + h > 512)
     h = 512 - y;
 
   if (y + h > 512)
     h = 512 - y;
 

-  for (i = 0; i < 4 && w > 0; i++) {
-    if (x < 512) {
-      wb = w;
-      if (x + w > 512)
-        wb = 512 - x;
-      src = gpu.vram + xt * i + y * 1024 + x;
-      dst = egpu.enhancement_buf_ptr +
-        (1024*1024 + xt * 2) * i + (y * 1024 + x) * 2;
-      scale2x_tiles8(dst, src, wb / 8, h);
-    }
-
-    x -= xt;
-    if (x < 0) {
-      w += x;
-      x = 0;
-    }
+  while (w > 0) {
+    fb_index = egpu.enhancement_buf_by_x16[x / step_x];
+    for (w1 = 0; w > 0; w1++, w -= step_x)
+      if (fb_index != egpu.enhancement_buf_by_x16[x / step_x + w1])
+        break;
+
+    src = gpu.vram + y * 1024 + x;
+    dst = select_enhancement_buf_ptr(&egpu, x);
+    dst += (y * 1024 + x) * 2;
+    scale2x_tiles8(dst, src, w1 * step_x / 8, h);
+
+    x += w1 * step_x;

   }
 }
 
   }
 }
 


@@ -138,7 +139,11 @@ void renderer_set_interlace(int enable, int is_odd)
 void renderer_notify_res_change(void)
 {
   // note: must keep it multiple of 8
 void renderer_notify_res_change(void)
 {
   // note: must keep it multiple of 8

-  egpu.enhancement_x_threshold = gpu.screen.hres;
+  if (egpu.enhancement_x_threshold != gpu.screen.hres)
+  {
+    egpu.enhancement_x_threshold = gpu.screen.hres;
+    update_enhancement_buf_table(&egpu);
+  }

 }
 
 #include "../../frontend/plugin_lib.h"
 }
 
 #include "../../frontend/plugin_lib.h"