From 4a263e4ec1aedf1b25f511ce4926477dacdd105c Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 13 Sep 2020 14:35:58 +1000
Subject: [PATCH] Android: Add texture filter options

---
 android/app/src/main/res/values/arrays.xml        | 12 ++++++++++++
 android/app/src/main/res/xml/root_preferences.xml | 12 +++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index c35f0db98..9d6f176db 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -93,6 +93,18 @@
         <item>1:1</item>
         <item>PAR 1:1</item>
     </string-array>
+    <string-array name="settings_gpu_texture_filter_names">
+        <item>Nearest-Neighbor</item>
+        <item>Bilinear</item>
+        <item>JINC2</item>
+        <item>xBR</item>
+    </string-array>
+    <string-array name="settings_gpu_texture_filter_values">
+        <item>Nearest</item>
+        <item>Bilinear</item>
+        <item>JINC2</item>
+        <item>xBR</item>
+    </string-array>
     <string-array name="settings_controller_type_entries">
         <item>Digital Controller (Gamepad)</item>
         <item>Analog Controller (DualShock)</item>
diff --git a/android/app/src/main/res/xml/root_preferences.xml b/android/app/src/main/res/xml/root_preferences.xml
index c4fcb9e17..e8b69030b 100644
--- a/android/app/src/main/res/xml/root_preferences.xml
+++ b/android/app/src/main/res/xml/root_preferences.xml
@@ -124,11 +124,13 @@
             app:defaultValue="true"
             app:summary="Forces the rendering and display of frames to progressive mode. This removes the &quot;combing&quot; effect seen in 480i games by rendering them in 480p. Usually safe to enable." />
 
-        <SwitchPreferenceCompat
-            app:key="GPU/TextureFiltering"
-            app:title="Bilinear Texture Filtering"
-            app:defaultValue="false"
-            app:summary="Smooths out the blockyness of magnified textures on 3D object by using bilinear filtering. Will have a greater effect on higher resolution scales. Only applies to the hardware renderers." />
+        <ListPreference
+            app:key="GPU/TextureFilter"
+            app:title="Texture Filtering"
+            app:entries="@array/settings_gpu_texture_filter_names"
+            app:entryValues="@array/settings_gpu_texture_filter_values"
+            app:defaultValue="Nearest"
+            app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat
             app:key="GPU/ForceNTSCTimings"