From 040d19d0bc0a97b1cf0d4d8b9f39ecb1be5e1cdc Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Wed, 23 Nov 2016 19:29:38 +1100
Subject: [PATCH] [Android] Add setting for Pre alloc sync memory

---
 Android/res/values/strings.xml                           | 2 ++
 Android/res/xml/settings_advanced.xml                    | 4 ++++
 Android/src/emu/project64/settings/SettingsActivity.java | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
index e13427277..fac916e30 100644
--- a/Android/res/values/strings.xml
+++ b/Android/res/values/strings.xml
@@ -181,6 +181,8 @@
     <string name="RecordExecutionTimes_summary">Record how long each block executes for</string>
     <string name="ForceGfxReset_title">Reset GFX Plugin</string>
     <string name="ForceGfxReset_summary">Always reload GFX plugin</string>
+    <string name="PreAllocSyncMem_title">Pre Alloc Sync Mem</string>
+    <string name="PreAllocSyncMem_summary">Allocate sync memory at startup</string>
     <string name="touchscreenScale_title">Button scale</string>
     <string name="touchscreenLayout_title">Touchscreen layout</string>
     <string name="gamepad_summary">Configure gamepad to use in game</string>
diff --git a/Android/res/xml/settings_advanced.xml b/Android/res/xml/settings_advanced.xml
index d283feaa0..14a9ce8fe 100644
--- a/Android/res/xml/settings_advanced.xml
+++ b/Android/res/xml/settings_advanced.xml
@@ -30,6 +30,10 @@
         android:key="Plugin_ForceGfxReset"
         android:summary="@string/ForceGfxReset_summary"
         android:title="@string/ForceGfxReset_title" />
+    <CheckBoxPreference
+        android:key="PreAllocSyncMem"
+        android:summary="@string/PreAllocSyncMem_summary"
+        android:title="@string/PreAllocSyncMem_title" />
     <PreferenceCategory android:title="@string/logging" >
       <Preference
           android:title="@string/project64core"
diff --git a/Android/src/emu/project64/settings/SettingsActivity.java b/Android/src/emu/project64/settings/SettingsActivity.java
index 081591ab7..5bc6a86c5 100644
--- a/Android/src/emu/project64/settings/SettingsActivity.java
+++ b/Android/src/emu/project64/settings/SettingsActivity.java
@@ -55,6 +55,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         .putInt("touchscreenScale",NativeExports.UISettingsLoadDword(UISettingID.TouchScreen_ButtonScale.getValue()))
         .putString("touchscreenLayout",NativeExports.UISettingsLoadString(UISettingID.TouchScreen_Layout.getValue()))
         .putBoolean("audio_Enabled",NativeExports.SettingsLoadBool(SettingsID.Plugin_EnableAudio.getValue()))
+        .putBoolean("PreAllocSyncMem",NativeExports.SettingsLoadBool(SettingsID.Setting_PreAllocSyncMem.getValue()))
         .putBoolean("Plugin_ForceGfxReset",NativeExports.SettingsLoadBool(SettingsID.Plugin_ForceGfxReset.getValue()))
         .putBoolean("UserInterface_BasicMode",NativeExports.SettingsLoadBool(SettingsID.UserInterface_BasicMode.getValue()))
         .putBoolean("Debugger_Enabled",NativeExports.SettingsLoadBool(SettingsID.Debugger_Enabled.getValue()))
@@ -133,6 +134,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         else if (key.equals("touchscreenLayout")) { NativeExports.UISettingsSaveString(UISettingID.TouchScreen_Layout.getValue(), sharedPreferences.getString(key, "Analog")); }
         else if (key.equals("audio_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Plugin_EnableAudio.getValue(), sharedPreferences.getBoolean(key,false)); }
         else if (key.equals("Plugin_ForceGfxReset")) { NativeExports.SettingsSaveBool(SettingsID.Plugin_ForceGfxReset.getValue(), sharedPreferences.getBoolean(key,false)); }
+        else if (key.equals("PreAllocSyncMem")) { NativeExports.SettingsSaveBool(SettingsID.Setting_PreAllocSyncMem.getValue(), sharedPreferences.getBoolean(key,false)); }
         else if (key.equals("Debugger_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_Enabled.getValue(), sharedPreferences.getBoolean(key,false)); }
         else if (key.equals("Debugger_GenerateLogFiles")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_GenerateLogFiles.getValue(), sharedPreferences.getBoolean(key,false)); }
         else if (key.equals("Debugger_CpuUsage")) { NativeExports.SettingsSaveBool(SettingsID.UserInterface_ShowCPUPer.getValue(), sharedPreferences.getBoolean(key,false)); }