X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=8df90365b1d2df033b33268f7fc60560ec693895;hp=d7f23ed4cd52b935f5c9117b151a1433bd33ecab;hb=dd4d5a35678c8ff7f9a7c0ac42be354671534f96;hpb=a805c8556900f3abca95c6b6536a9c267f8135fc

diff --git a/frontend/main.c b/frontend/main.c
index d7f23ed4..8df90365 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -131,7 +131,7 @@ static void set_default_paths(void)
 	strcpy(Config.Pad2, "builtin_pad");
 	strcpy(Config.Net, "Disabled");
 #if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
-	strcpy(Config.Gpu, "gpuPCSX4ALL.so");
+	strcpy(Config.Gpu, "gpu_unai.so");
 #endif
 
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
@@ -145,12 +145,15 @@ void emu_set_default_config(void)
 	Config.CdrReschedule = 0;
 	Config.PsxAuto = 1;
 
+	pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
 	pl_rearmed_cbs.gpu_peops.iUseDither = 0;
 	pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
 	pl_rearmed_cbs.gpu_unai.abe_hack =
 	pl_rearmed_cbs.gpu_unai.no_light =
 	pl_rearmed_cbs.gpu_unai.no_blend = 0;
-	pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
+	memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
+	pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
+	pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
 
 	iUseReverb = 2;
 	iUseInterpolation = 1;
@@ -361,9 +364,9 @@ int main(int argc, char *argv[])
 		return 1;
 
 	// frontend stuff
+	// init input but leave probing to platform code,
+	// they add input drivers and may need to modify them after probe
 	in_init();
-	in_evdev_init();
-	//in_probe();
 	pl_init();
 	plat_init();
 	menu_init(); // loads config
@@ -530,6 +533,9 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
+#ifndef __ARM_ARCH_7A__ /* XXX */
+	sync();
+#endif
 	printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
 	return ret;
 }
@@ -724,9 +730,11 @@ void *SysLoadLibrary(const char *lib) {
 
 #if defined(__x86_64__) || defined(__i386__)
 	// convenience hack
-	char name[MAXPATHLEN];
-	snprintf(name, sizeof(name), "%s.x86", lib);
-	lib = name;
+	if (strstr(lib, ".x86") == NULL) {
+		char name[MAXPATHLEN];
+		snprintf(name, sizeof(name), "%s.x86_64", lib);
+		lib = name;
+	}
 #endif
 
 	ret = dlopen(lib, RTLD_NOW);