From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 26 May 2013 21:34:56 +0000 (+0200)
Subject: Merge git://github.com/notaz/pcsx_rearmed
X-Git-Tag: r24l~926
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5948832fca5e81cc263bb57d784b6a81c19d1d71;hp=-c;p=pcsx_rearmed.git

Merge git://github.com/notaz/pcsx_rearmed
---

5948832fca5e81cc263bb57d784b6a81c19d1d71
diff --combined frontend/libretro.c
index ed767987,644db92d..413098d1
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@@ -243,7 -243,9 +243,7 @@@ void retro_set_environment(retro_enviro
        { "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
  #endif
        { NULL, NULL },
     };
@@@ -650,6 -652,7 +650,7 @@@ bool retro_load_game(const struct retro
  	}
  
  	plugin_call_rearmed_cbs();
+ 	dfinput_activate();
  
  	Config.PsxAuto = 1;
  	if (CheckCdrom() == -1) {
@@@ -767,6 -770,7 +768,6 @@@ static void update_variables(bool in_fl
           pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
     }
  
 -#if 0
     var.value = NULL;
     var.key = "neon_enhancement_enable";
  
@@@ -777,6 -781,7 +778,6 @@@
        else if (strcmp(var.value, "enabled") == 0)
           pl_rearmed_cbs.gpu_neon.enhancement_enable = 1;
     }
 -#endif
  #endif
  
  	if (in_flight) {
@@@ -787,9 -792,9 +788,9 @@@
  			GPU_close();
  			GPU_open(&gpuDisp, "PCSX", NULL);
  		}
- 	}
  
- 	dfinput_activate();
+ 		dfinput_activate();
+ 	}
  }
  
  void retro_run(void)