From e18860830ab26064ded6a1c22a75c4d036237a44 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 19 Sep 2014 09:09:44 -0500
Subject: [PATCH] Show OpenGL or OpenGL ES on Android depending on what the
 device supports. Reduces confusion for the users

---
 Source/Android/res/values-ja/strings.xml              |  1 +
 Source/Android/res/values/arrays.xml                  | 11 ++++++++++-
 Source/Android/res/values/strings.xml                 |  1 +
 .../settings/video/VideoSettingsFragment.java         |  8 +++++++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 685fbdc027..59e72d1819 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -150,6 +150,7 @@
     <string name="video_settings">ビデオ</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES</string>
+    <string name="opengl">OpenGL</string>
     <string name="video_backend">ビデオレンダラ</string>
     <string name="video_backend_desc">%s</string>
     <string name="show_fps">FPSを表示</string>
diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml
index 1822ede7c1..8e9ba5ede3 100644
--- a/Source/Android/res/values/arrays.xml
+++ b/Source/Android/res/values/arrays.xml
@@ -53,6 +53,16 @@
         <item>Software Renderer</item>
         <item>OGL</item>
     </string-array>
+
+    <!-- Video Backend Selection - Supports desktop OpenGL -->
+    <string-array name="videoBackendEntriesGL" translatable="false">
+        <item>@string/software_renderer</item>
+        <item>@string/opengl</item>
+    </string-array>
+    <string-array name="videoBackendValuesGL" translatable="false">
+        <item>Software Renderer</item>
+        <item>OGL</item>
+    </string-array>
     
     <!-- Video Backend Selection - No OpenGL ES 3 support -->
     <string-array name="videoBackendEntriesNoGLES3" translatable="false">
@@ -62,7 +72,6 @@
         <item>Software Renderer</item>
     </string-array>
     
-    
     <!-- EFB Copy Method Preference -->
     <string-array name="efbCopyMethodEntries" translatable="false">
         <item>@string/disabled</item>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index eee83eb431..6c68328e8b 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -151,6 +151,7 @@
     <string name="video_settings">Video</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES</string>
+    <string name="opengl">OpenGL</string>
     <string name="video_backend">Video Backend</string>
     <string name="video_backend_desc">%s</string>
     <string name="show_fps">Show FPS</string>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
index fe41335bd3..ac5a0da65c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
@@ -47,9 +47,15 @@ public final class VideoSettingsFragment extends PreferenceFragment
 		// Setting valid video backends.
 		//
 		final ListPreference videoBackends = (ListPreference) findPreference("gpuPref");
+		final boolean deviceSupportsGL = eglHelper.supportsOpenGL();
 		final boolean deviceSupportsGLES3 = eglHelper.supportsGLES3();
 
-		if (deviceSupportsGLES3)
+		if (deviceSupportsGL)
+		{
+			videoBackends.setEntries(R.array.videoBackendEntriesGL);
+			videoBackends.setEntryValues(R.array.videoBackendValuesGL);
+		}
+		else if (deviceSupportsGLES3)
 		{
 			videoBackends.setEntries(R.array.videoBackendEntriesGLES3);
 			videoBackends.setEntryValues(R.array.videoBackendValuesGLES3);