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 @@ ビデオ Software Renderer OpenGL ES + OpenGL ビデオレンダラ %s FPSを表示 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 @@ Software Renderer OGL + + + + @string/software_renderer + @string/opengl + + + Software Renderer + OGL + @@ -62,7 +72,6 @@ Software Renderer - @string/disabled 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 @@ Video Software Renderer OpenGL ES + OpenGL Video Backend %s Show FPS 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);