From 05d8bafb46b562113764f287d37a2ec2b0c4a28f Mon Sep 17 00:00:00 2001
From: weihuoya <zwdreams@gmail.com>
Date: Mon, 21 Jan 2019 11:04:20 +0800
Subject: [PATCH] fx MSAA

---
 .../features/settings/ui/SettingsFragmentPresenter.java       | 2 +-
 Source/Android/app/src/main/res/values-zh/arrays.xml          | 4 ++--
 Source/Android/app/src/main/res/values-zh/strings.xml         | 2 +-
 Source/Android/app/src/main/res/values/arrays.xml             | 4 ++--
 Source/Core/Core/Config/GraphicsSettings.cpp                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index 95408b92afb2..bfd57de6d702 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -419,7 +419,7 @@ private void addEnhanceSettings(ArrayList<SettingsItem> sl)
       R.string.internal_resolution, R.string.internal_resolution_description,
       R.array.internalResolutionEntries, R.array.internalResolutionValues, 1, resolution));
     sl.add(new SingleChoiceSetting(SettingsFile.KEY_FSAA, Settings.SECTION_GFX_SETTINGS,
-      R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 0,
+      R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 1,
       fsaa));
     sl.add(new SingleChoiceSetting(SettingsFile.KEY_ANISOTROPY, Settings.SECTION_GFX_ENHANCEMENTS,
       R.string.anisotropic_filtering, R.string.anisotropic_filtering_description,
diff --git a/Source/Android/app/src/main/res/values-zh/arrays.xml b/Source/Android/app/src/main/res/values-zh/arrays.xml
index 6f041fb4cac5..3444b728b358 100644
--- a/Source/Android/app/src/main/res/values-zh/arrays.xml
+++ b/Source/Android/app/src/main/res/values-zh/arrays.xml
@@ -173,10 +173,10 @@
         <item>8x</item>
     </string-array>
     <integer-array name="FSAAValues" translatable="false">
-        <item>0</item>
         <item>1</item>
         <item>2</item>
-        <item>3</item>
+        <item>4</item>
+        <item>8</item>
     </integer-array>
 
     <!-- Anisotropic Filtering Preference -->
diff --git a/Source/Android/app/src/main/res/values-zh/strings.xml b/Source/Android/app/src/main/res/values-zh/strings.xml
index d9eaaa2dc3e6..f886a8ebf93a 100644
--- a/Source/Android/app/src/main/res/values-zh/strings.xml
+++ b/Source/Android/app/src/main/res/values-zh/strings.xml
@@ -212,7 +212,7 @@
     <string name="texture_cache_accuracy">纹理缓存精度</string>
     <string name="texture_cache_accuracy_description">提高缓存精度，模拟器能及时从缓存中更新纹理。如果出现文字显示问题，请提高精度。</string>
     <string name="gpu_texture_decoding">GPU纹理解码</string>
-    <string name="gpu_texture_decoding_description">使用着色器解码纹理，但需要硬件支持。</string>
+    <string name="gpu_texture_decoding_description">使用GPU着色器解码纹理，但需要硬件支持。</string>
     <string name="external_frame_buffer">外部帧缓存</string>
     <string name="xfb_copy_method">只将XFB复制到纹理</string>
     <string name="xfb_copy_method_description">只将XFB保存在GPU，在少数游戏中会造成显示问题。如果不确定，请不要勾选此选项。</string>
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 3243d45bad2a..c148e6b4539e 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -174,10 +174,10 @@
         <item>8x</item>
     </string-array>
     <integer-array name="FSAAValues" translatable="false">
-        <item>0</item>
         <item>1</item>
         <item>2</item>
-        <item>3</item>
+        <item>4</item>
+        <item>8</item>
     </integer-array>
 
     <!-- Anisotropic Filtering Preference -->
diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp
index 50dbeace4baa..763c26a767c0 100644
--- a/Source/Core/Core/Config/GraphicsSettings.cpp
+++ b/Source/Core/Core/Config/GraphicsSettings.cpp
@@ -58,7 +58,7 @@ const ConfigInfo<bool> GFX_ENABLE_GPU_TEXTURE_DECODING{
 const ConfigInfo<bool> GFX_ENABLE_PIXEL_LIGHTING{{System::GFX, "Settings", "EnablePixelLighting"},
                                                  false};
 const ConfigInfo<bool> GFX_FAST_DEPTH_CALC{{System::GFX, "Settings", "FastDepthCalc"}, true};
-const ConfigInfo<u32> GFX_MSAA{{System::GFX, "Settings", "MSAA"}, 0};
+const ConfigInfo<u32> GFX_MSAA{{System::GFX, "Settings", "MSAA"}, 1};
 const ConfigInfo<bool> GFX_SSAA{{System::GFX, "Settings", "SSAA"}, false};
 const ConfigInfo<int> GFX_EFB_SCALE{{System::GFX, "Settings", "InternalResolution"}, 1};
 const ConfigInfo<bool> GFX_TEXFMT_OVERLAY_ENABLE{{System::GFX, "Settings", "TexFmtOverlayEnable"},