summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-07 00:18:40 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-07 00:18:40 +0100
commit6d678490f51cc0154a0bdedf9dce23c77fdfb991 (patch)
tree32e4930c220c3a3568ef92fc3529e8edf890a4c6 /Source/Android
parent4c6d4cc27092ffbdd7be3483b83e355fbc115f4e (diff)
parent3666178f858611c45b0e2782e4ef0474e14b418a (diff)
Merge pull request #46 from Sonicadvance1/Android-removeDLCache
Remove Cache DL option from Android UI
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/res/values-ja/strings.xml2
-rw-r--r--Source/Android/res/values/strings.xml2
-rw-r--r--Source/Android/res/xml/video_prefs.xml6
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java3
4 files changed, 0 insertions, 13 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index cb206ae8a2..8227c7b2d4 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -185,8 +185,6 @@
<string name="external_frame_buffer_descrip">XFBをエミュレート方法を決定。</string>
<string name="external_frame_buffer_virtual">バーチャル</string>
<string name="external_frame_buffer_real">実機</string>
- <string name="cache_display_lists">Cache Display Lists</string>
- <string name="cache_display_lists_descrip">ディスプレイリストをキャッシュすることによりエミュレーション速度を向上。</string>
<string name="disable_destination_alpha">Disable Destination Alpha</string>
<string name="disable_destination_alpha_descrip">多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ 。</string>
<string name="fast_depth_calculation">高速奥行き計算</string>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 0fae5bab6c..62c56f06c2 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -187,8 +187,6 @@
<string name="external_frame_buffer_descrip">Determines how the XFB will be emulated.</string>
<string name="external_frame_buffer_virtual">Virtual</string>
<string name="external_frame_buffer_real">Real</string>
- <string name="cache_display_lists">Cache Display Lists</string>
- <string name="cache_display_lists_descrip">Speeds up emulation a bit by caching display lists.</string>
<string name="disable_destination_alpha">Disable Destination Alpha</string>
<string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
<string name="fast_depth_calculation">Fast Depth Calculation</string>
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
index 2f9c7eb36e..e2807956be 100644
--- a/Source/Android/res/xml/video_prefs.xml
+++ b/Source/Android/res/xml/video_prefs.xml
@@ -108,12 +108,6 @@
<CheckBoxPreference
android:defaultValue="false"
- android:key="cacheDisplayLists"
- android:summary="@string/cache_display_lists_descrip"
- android:title="@string/cache_display_lists"/>
-
- <CheckBoxPreference
- android:defaultValue="false"
android:key="disableDestinationAlpha"
android:summary="@string/disable_destination_alpha_descrip"
android:title="@string/disable_destination_alpha"/>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 28aae92ed4..a18e4a12bb 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -146,9 +146,6 @@ public final class UserPreferences
// External frame buffer emulation. Falls back to disabled upon error.
String externalFrameBuffer = prefs.getString("externalFrameBuffer", "Disabled");
- // Whether or not display list caching is enabled.
- boolean dlistCachingEnabled = prefs.getBoolean("cacheDisplayLists", false);
-
// Whether or not to disable destination alpha.
boolean disableDstAlphaPass = prefs.getBoolean("disableDestinationAlpha", false);