X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=9be52f5dacdd39e86adc58966fdc5fe7b11b737f;hp=024ea7a50ab9d84198db942f36aa3467d1002e81;hb=354329faa304cfc2da1ef2f4ce9ef5e06c7d3489;hpb=a69536d7f28f096b5bc9075abcb18821524ebdd8

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 024ea7a5..9be52f5d 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -5,6 +5,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#define _GNU_SOURCE 1 // strcasestr
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +18,7 @@
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/cheat.h"
 #include "../plugins/dfsound/out.h"
+#include "../plugins/dfinput/externals.h"
 #include "cspace.h"
 #include "main.h"
 #include "plugin.h"
@@ -49,6 +51,10 @@ int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_keystate;
 int in_enable_vibration;
 
+/* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
+#define VOUT_MAX_WIDTH 1024
+#define VOUT_MAX_HEIGHT 512
+
 static void init_memcard(char *mcd_data)
 {
 	unsigned off = 0;
@@ -237,9 +243,8 @@ void retro_set_environment(retro_environment_t cb)
       { "region", "Region; Auto|NTSC|PAL" },
 #ifdef __ARM_NEON__
       { "neon_interlace_enable", "Enable interlacing mode(s); disabled|enabled" },
-#if 0
       { "neon_enhancement_enable", "Enhanced resolution (slow); disabled|enabled" },
-#endif
+      { "neon_enhancement_no_main", "Enhanced resolution speed hack; disabled|enabled" },
 #endif
       { NULL, NULL },
    };
@@ -280,8 +285,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 	info->timing.sample_rate    = 44100;
 	info->geometry.base_width   = 320;
 	info->geometry.base_height  = 240;
-	info->geometry.max_width    = 640;
-	info->geometry.max_height   = 512;
+	info->geometry.max_width    = VOUT_MAX_WIDTH;
+	info->geometry.max_height   = VOUT_MAX_HEIGHT;
 	info->geometry.aspect_ratio = 4.0 / 3.0;
 }
 
@@ -646,6 +651,7 @@ bool retro_load_game(const struct retro_game_info *info)
 	}
 
 	plugin_call_rearmed_cbs();
+	dfinput_activate();
 
 	Config.PsxAuto = 1;
 	if (CheckCdrom() == -1) {
@@ -728,7 +734,7 @@ static const unsigned short retro_psx_map[] = {
 };
 #define RETRO_PSX_MAP_LEN (sizeof(retro_psx_map) / sizeof(retro_psx_map[0]))
 
-static void update_variables(void)
+static void update_variables(bool in_flight)
 {
    struct retro_variable var;
    
@@ -763,7 +769,6 @@ static void update_variables(void)
          pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
    }
 
-#if 0
    var.value = NULL;
    var.key = "neon_enhancement_enable";
 
@@ -774,8 +779,30 @@ static void update_variables(void)
       else if (strcmp(var.value, "enabled") == 0)
          pl_rearmed_cbs.gpu_neon.enhancement_enable = 1;
    }
+
+   var.value = NULL;
+   var.key = "neon_enhancement_no_main";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      if (strcmp(var.value, "disabled") == 0)
+         pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
+      else if (strcmp(var.value, "enabled") == 0)
+         pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1;
+   }
 #endif
-#endif
+
+	if (in_flight) {
+		// inform core things about possible config changes
+		plugin_call_rearmed_cbs();
+
+		if (GPU_open != NULL && GPU_close != NULL) {
+			GPU_close();
+			GPU_open(&gpuDisp, "PCSX", NULL);
+		}
+
+		dfinput_activate();
+	}
 }
 
 void retro_run(void) 
@@ -784,9 +811,9 @@ void retro_run(void)
 
 	input_poll_cb();
 
-   bool updated = false;
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
-      update_variables();
+	bool updated = false;
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
+		update_variables(true);
 
 	in_keystate = 0;
 	for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
@@ -822,7 +849,7 @@ void retro_init(void)
 		exit(1);
 	}
 
-	vout_buf = malloc(640 * 512 * 2);
+	vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
 
 	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
 	{
@@ -844,8 +871,12 @@ void retro_init(void)
 	else
    {
 		SysPrintf("no BIOS files found.\n");
-      const char *str = "no BIOS found, expect bugs!";
-      environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&str);
+      struct retro_message msg = 
+      {
+         "no BIOS found, expect bugs!",
+         180
+      };
+      environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg);
    }
 
 	level = 1;
@@ -873,7 +904,7 @@ void retro_init(void)
 	SaveFuncs.seek = save_seek;
 	SaveFuncs.close = save_close;
 
-   update_variables();
+	update_variables(false);
 }
 
 void retro_deinit(void)