psx_gpu: switch to 1024 width again.

[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 3ff6e48..250aa8c 100644 (file)
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -13,26 +13,60 @@
 extern const unsigned char cmd_lengths[256];
 #define command_lengths cmd_lengths
 
+static unsigned int *ex_regs;
+
+#define PCSX
+#define SET_Ex(r, v) \
+  ex_regs[r] = v
+
 #include "psx_gpu/psx_gpu.c"
 #include "psx_gpu/psx_gpu_parse.c"
 #include "../gpulib/gpu.h"
 
 static psx_gpu_struct egpu __attribute__((aligned(256)));
 
-void do_cmd_list(uint32_t *list, int count)
+int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 {
-  gpu_parse(&egpu, list, count * 4);
+  int ret;
+
+  if (gpu.state.enhancement_active)
+    ret = gpu_parse_enhanced(&egpu, list, count * 4, (u32 *)last_cmd);
+  else
+    ret = gpu_parse(&egpu, list, count * 4, (u32 *)last_cmd);
+
+  ex_regs[1] &= ~0x1ff;
+  ex_regs[1] |= egpu.texture_settings & 0x1ff;
+  return ret;
 }
 
 int renderer_init(void)
 {
   initialize_psx_gpu(&egpu, gpu.vram);
+  ex_regs = gpu.ex_regs;
+
+  if (gpu.enhancement_bufer == NULL) {
+    // currently we use 4x 1024*1024 buffers instead of single 2048*1024
+    // to be able to reuse 1024-width code better (triangle setup,
+    // dithering phase, lines).
+    gpu.enhancement_bufer = malloc(1024 * 1024 * 2 * 4);
+    if (gpu.enhancement_bufer == NULL)
+      printf("OOM for enhancement buffer\n");
+  }
+  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
+
   return 0;
 }
 
+void renderer_finish(void)
+{
+  free(gpu.enhancement_bufer);
+  gpu.enhancement_bufer = NULL;
+  egpu.enhancement_buf_ptr = NULL;
+}
+
 void renderer_sync_ecmds(uint32_t *ecmds)
 {
-  gpu_parse(&egpu, ecmds + 1, 6 * 4);
+  gpu_parse(&egpu, ecmds + 1, 6 * 4, NULL);
 }
 
 void renderer_update_caches(int x, int y, int w, int h)
@@ -47,13 +81,21 @@ void renderer_flush_queues(void)
 
 void renderer_set_interlace(int enable, int is_odd)
 {
-  egpu.interlace_mode &= ~(RENDER_INTERLACE_ENABLED|RENDER_INTERLACE_ODD);
+  egpu.render_mode &= ~(RENDER_INTERLACE_ENABLED|RENDER_INTERLACE_ODD);
   if (enable)
-    egpu.interlace_mode |= RENDER_INTERLACE_ENABLED;
+    egpu.render_mode |= RENDER_INTERLACE_ENABLED;
   if (is_odd)
-    egpu.interlace_mode |= RENDER_INTERLACE_ODD;
+    egpu.render_mode |= RENDER_INTERLACE_ODD;
+}
+
+void renderer_notify_res_change(void)
+{
+  egpu.enhancement_x_threshold = gpu.screen.hres;
 }
 
+#include "../../frontend/plugin_lib.h"
+
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {
+  disable_main_render = cbs->gpu_neon.enhancement_no_main;
 }