From c1817bd9249ee616cf9545a57136d6dd3669ce34 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 13 Aug 2012 00:03:43 +0300
Subject: psx_gpu: add enhanced triangle rendering

---
 plugins/gpu_neon/psx_gpu_if.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to '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 ff31c27..8610c83 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -27,7 +27,12 @@ static psx_gpu_struct egpu __attribute__((aligned(256)));
 
 int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 {
-  int ret = gpu_parse(&egpu, list, count * 4, (u32 *)last_cmd);
+  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;
@@ -38,6 +43,7 @@ int renderer_init(void)
 {
   initialize_psx_gpu(&egpu, gpu.vram);
   ex_regs = gpu.ex_regs;
+  gpu.state.enhancement_available = 1;
   return 0;
 }
 
@@ -65,6 +71,10 @@ void renderer_set_interlace(int enable, int is_odd)
     egpu.interlace_mode |= RENDER_INTERLACE_ODD;
 }
 
+#include "../../frontend/plugin_lib.h"
+
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {
+  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
+  disable_main_render = cbs->gpu_neon.enhancement_no_main;
 }
-- 
cgit v1.2.3


From f1359c5758c2e745b1cbec63e21445fa65f7cafe Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 13 Aug 2012 02:53:21 +0300
Subject: psx_gpu: switch enhancement to 2048 width

otherwise games that position framebuffers horizontally corrupt the
display.
---
 plugins/gpu_neon/psx_gpu_if.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '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 8610c83..d42f83a 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -64,11 +64,11 @@ 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;
 }
 
 #include "../../frontend/plugin_lib.h"
-- 
cgit v1.2.3


From e929dec505f8d3692248fe0d42c84a37c994ad39 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sat, 18 Aug 2012 02:37:49 +0300
Subject: psx_gpu: switch to 1024 width again.

---
 plugins/gpu_neon/psx_gpu_if.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to '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 d42f83a..250aa8c 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -43,10 +43,27 @@ int renderer_init(void)
 {
   initialize_psx_gpu(&egpu, gpu.vram);
   ex_regs = gpu.ex_regs;
-  gpu.state.enhancement_available = 1;
+
+  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, NULL);
@@ -71,10 +88,14 @@ void renderer_set_interlace(int enable, int is_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)
 {
-  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
   disable_main_render = cbs->gpu_neon.enhancement_no_main;
 }
-- 
cgit v1.2.3


From 50f9355a2338111d940ed408f52fe1defe4df23e Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 19 Aug 2012 00:37:50 +0300
Subject: psx_gpu: start handling vram loads/moves for enhancement

---
 plugins/gpu_neon/psx_gpu_if.c | 56 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

(limited to '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 250aa8c..ca76fe2 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -9,6 +9,7 @@
  */
 
 #include <stdio.h>
+#include <sys/mman.h>
 
 extern const unsigned char cmd_lengths[256];
 #define command_lengths cmd_lengths
@@ -39,6 +40,8 @@ int do_cmd_list(uint32_t *list, int count, int *last_cmd)
   return ret;
 }
 
+#define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096)
+
 int renderer_init(void)
 {
   initialize_psx_gpu(&egpu, gpu.vram);
@@ -48,9 +51,12 @@ int renderer_init(void)
     // 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)
+    gpu.enhancement_bufer = mmap(NULL, ENHANCEMENT_BUF_SIZE,
+      PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    if (gpu.enhancement_bufer == MAP_FAILED) {
       printf("OOM for enhancement buffer\n");
+      gpu.enhancement_bufer = NULL;
+    }
   }
   egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
 
@@ -59,11 +65,44 @@ int renderer_init(void)
 
 void renderer_finish(void)
 {
-  free(gpu.enhancement_bufer);
+  if (gpu.enhancement_bufer != NULL)
+    munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);
   gpu.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;
 }
 
+static __attribute__((noinline)) void
+sync_enhancement_buffers(int x, int y, int w, int h)
+{
+  int xt = egpu.enhancement_x_threshold;
+  u16 *src, *dst;
+  int wb, i;
+
+  w += x & 7;
+  x &= ~7;
+  w = (w + 7) & ~7;
+  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;
+    }
+  }
+}
+
 void renderer_sync_ecmds(uint32_t *ecmds)
 {
   gpu_parse(&egpu, ecmds + 1, 6 * 4, NULL);
@@ -72,6 +111,8 @@ void renderer_sync_ecmds(uint32_t *ecmds)
 void renderer_update_caches(int x, int y, int w, int h)
 {
   update_texture_cache_region(&egpu, x, y, x + w - 1, y + h - 1);
+  if (gpu.state.enhancement_active && !gpu.status.rgb24)
+    sync_enhancement_buffers(x, y, w, h);
 }
 
 void renderer_flush_queues(void)
@@ -90,6 +131,7 @@ void renderer_set_interlace(int enable, int is_odd)
 
 void renderer_notify_res_change(void)
 {
+  // note: must keep it multiple of 8
   egpu.enhancement_x_threshold = gpu.screen.hres;
 }
 
@@ -97,5 +139,13 @@ void renderer_notify_res_change(void)
 
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {
+  static int enhancement_was_on;
+
   disable_main_render = cbs->gpu_neon.enhancement_no_main;
+  if (egpu.enhancement_buf_ptr != NULL && cbs->gpu_neon.enhancement_enable
+      && !enhancement_was_on)
+  {
+    sync_enhancement_buffers(0, 0, 1024, 512);
+  }
+  enhancement_was_on = cbs->gpu_neon.enhancement_enable;
 }
-- 
cgit v1.2.3


From 9ee0fd5b333039b1140d90f935aa9299825f1e42 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 19 Aug 2012 22:39:49 +0300
Subject: start mmap'ing vram, with hugetlb if possible

---
 plugins/gpu_neon/psx_gpu_if.c | 44 ++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to '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 ca76fe2..1b4dcc5 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -15,6 +15,7 @@ extern const unsigned char cmd_lengths[256];
 #define command_lengths cmd_lengths
 
 static unsigned int *ex_regs;
+static int initialized;
 
 #define PCSX
 #define SET_Ex(r, v) \
@@ -42,33 +43,38 @@ int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 
 #define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096)
 
-int renderer_init(void)
+static void map_enhancement_buffer(void)
 {
-  initialize_psx_gpu(&egpu, gpu.vram);
-  ex_regs = gpu.ex_regs;
+  // 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 = gpu.mmap(ENHANCEMENT_BUF_SIZE);
+  if (gpu.enhancement_bufer == NULL)
+    fprintf(stderr, "failed to map enhancement buffer\n");
+  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
+}
 
-  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 = mmap(NULL, ENHANCEMENT_BUF_SIZE,
-      PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    if (gpu.enhancement_bufer == MAP_FAILED) {
-      printf("OOM for enhancement buffer\n");
-      gpu.enhancement_bufer = NULL;
-    }
+int renderer_init(void)
+{
+  if (gpu.vram != NULL) {
+    initialize_psx_gpu(&egpu, gpu.vram);
+    initialized = 1;
   }
-  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
 
+  if (gpu.mmap != NULL && gpu.enhancement_bufer == NULL)
+    map_enhancement_buffer();
+
+  ex_regs = gpu.ex_regs;
   return 0;
 }
 
 void renderer_finish(void)
 {
   if (gpu.enhancement_bufer != NULL)
-    munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);
+    gpu.munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);
   gpu.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;
+  initialized = 0;
 }
 
 static __attribute__((noinline)) void
@@ -148,4 +154,12 @@ void renderer_set_config(const struct rearmed_cbs *cbs)
     sync_enhancement_buffers(0, 0, 1024, 512);
   }
   enhancement_was_on = cbs->gpu_neon.enhancement_enable;
+
+  if (!initialized) {
+    initialize_psx_gpu(&egpu, gpu.vram);
+    initialized = 1;
+  }
+
+  if (gpu.enhancement_bufer == NULL)
+    map_enhancement_buffer();
 }
-- 
cgit v1.2.3


From 06bc35c833797ce9f6f3287abf954f037bb12319 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 27 Aug 2012 02:04:01 +0300
Subject: various enhancement tweaks

---
 plugins/gpu_neon/psx_gpu_if.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to '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..c303742 100644
--- 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;
 }
 
-#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)
 {
@@ -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");
+  else
+    gpu.enhancement_bufer += 4096 / 2;
   egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
 }
 
@@ -70,10 +72,13 @@ int renderer_init(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.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;
+  egpu.enhancement_current_buf_ptr = NULL;
   initialized = 0;
 }
 
-- 
cgit v1.2.3


From 7956599fa5f666016f71870d9889748c97839041 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 22 Oct 2012 01:42:56 +0300
Subject: psx_gpu: select buffers differently

this handles weird drawing areas better
---
 plugins/gpu_neon/psx_gpu_if.c | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to '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 c303742..62c4f9e 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -85,32 +85,28 @@ void renderer_finish(void)
 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;
-  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;
 
-  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;
   }
 }
 
@@ -143,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
-  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"
-- 
cgit v1.2.3


From a8be0debff95f9b56af7c4c19eaacee782a09e28 Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 23 Oct 2012 00:34:30 +0300
Subject: gpu: move enhacement logic out of vout_pl

---
 plugins/gpu_neon/psx_gpu_if.c | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to '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 62c4f9e..3ce9c1c 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -43,17 +43,34 @@ int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 
 #define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096 * 2)
 
+static uint16_t *get_enhancement_bufer(int *x, int *y, int *w, int *h,
+ int *stride, int *mask)
+{
+  uint16_t *ret = select_enhancement_buf_ptr(&egpu, *x);
+
+  *x *= 2;
+  *y *= 2;
+  *w = *w * 2;
+  *h = *h * 2;
+  *stride *= 2;
+  *mask = 1024 * 1024 - 1;
+  return ret;
+}
+
 static void map_enhancement_buffer(void)
 {
   // 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 = gpu.mmap(ENHANCEMENT_BUF_SIZE);
-  if (gpu.enhancement_bufer == NULL)
+  egpu.enhancement_buf_ptr = gpu.mmap(ENHANCEMENT_BUF_SIZE);
+  if (egpu.enhancement_buf_ptr == NULL) {
     fprintf(stderr, "failed to map enhancement buffer\n");
-  else
-    gpu.enhancement_bufer += 4096 / 2;
-  egpu.enhancement_buf_ptr = gpu.enhancement_bufer;
+    gpu.get_enhancement_bufer = NULL;
+  }
+  else {
+    egpu.enhancement_buf_ptr += 4096 / 2;
+    gpu.get_enhancement_bufer = get_enhancement_bufer;
+  }
 }
 
 int renderer_init(void)
@@ -63,7 +80,7 @@ int renderer_init(void)
     initialized = 1;
   }
 
-  if (gpu.mmap != NULL && gpu.enhancement_bufer == NULL)
+  if (gpu.mmap != NULL && egpu.enhancement_buf_ptr == NULL)
     map_enhancement_buffer();
 
   ex_regs = gpu.ex_regs;
@@ -72,11 +89,10 @@ int renderer_init(void)
 
 void renderer_finish(void)
 {
-  if (gpu.enhancement_bufer != NULL) {
-    gpu.enhancement_bufer -= 4096 / 2;
-    gpu.munmap(gpu.enhancement_bufer, ENHANCEMENT_BUF_SIZE);
+  if (egpu.enhancement_buf_ptr != NULL) {
+    egpu.enhancement_buf_ptr -= 4096 / 2;
+    gpu.munmap(egpu.enhancement_buf_ptr, ENHANCEMENT_BUF_SIZE);
   }
-  gpu.enhancement_bufer = NULL;
   egpu.enhancement_buf_ptr = NULL;
   egpu.enhancement_current_buf_ptr = NULL;
   initialized = 0;
@@ -165,6 +181,6 @@ void renderer_set_config(const struct rearmed_cbs *cbs)
     initialized = 1;
   }
 
-  if (gpu.enhancement_bufer == NULL)
+  if (gpu.mmap != NULL && egpu.enhancement_buf_ptr == NULL)
     map_enhancement_buffer();
 }
-- 
cgit v1.2.3


From fa56d36096cd4ab2b227ce2aa61c8404b8874689 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 29 Oct 2012 01:08:35 +0200
Subject: move blit to core, allow filtering while blitting

also adds libpicofe to pull filters from, and filter related UI stuff
---
 plugins/gpu_neon/psx_gpu_if.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to '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 3ce9c1c..8900d4e 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -44,7 +44,7 @@ int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 #define ENHANCEMENT_BUF_SIZE (1024 * 1024 * 2 * 4 + 4096 * 2)
 
 static uint16_t *get_enhancement_bufer(int *x, int *y, int *w, int *h,
- int *stride, int *mask)
+ int *vram_h)
 {
   uint16_t *ret = select_enhancement_buf_ptr(&egpu, *x);
 
@@ -52,8 +52,7 @@ static uint16_t *get_enhancement_bufer(int *x, int *y, int *w, int *h,
   *y *= 2;
   *w = *w * 2;
   *h = *h * 2;
-  *stride *= 2;
-  *mask = 1024 * 1024 - 1;
+  *vram_h = 1024;
   return ret;
 }
 
@@ -183,4 +182,6 @@ void renderer_set_config(const struct rearmed_cbs *cbs)
 
   if (gpu.mmap != NULL && egpu.enhancement_buf_ptr == NULL)
     map_enhancement_buffer();
+  if (cbs->pl_set_gpu_caps)
+    cbs->pl_set_gpu_caps(GPU_CAP_SUPPORTS_2X);
 }
-- 
cgit v1.2.3


From 77e34391a6b3c8ae59768a941037451b7c81169f Mon Sep 17 00:00:00 2001
From: notaz
Date: Thu, 1 Nov 2012 19:03:27 +0200
Subject: psx_gpu: rework enhancement buffer selection

---
 plugins/gpu_neon/psx_gpu_if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '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 8900d4e..ad01761 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -157,7 +157,7 @@ void renderer_notify_res_change(void)
   if (egpu.enhancement_x_threshold != gpu.screen.hres)
   {
     egpu.enhancement_x_threshold = gpu.screen.hres;
-    update_enhancement_buf_table(&egpu);
+    update_enhancement_buf_table_from_hres(&egpu);
   }
 }
 
-- 
cgit v1.2.3