From a40daac5b14387a88d396f746a5298c39df76e34 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 6 Oct 2013 21:31:47 -0500 Subject: [PATCH] [Android] Fix an issue where emulation would crash if we couldn't retrieve GPU information. Also if we can't get the graphics information, give them the benefit of the doubt and enable the GLES3 option. --- .../dolphinemu/emulation/EmulationActivity.java | 1 + .../dolphinemu/settings/VideoSettingsFragment.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index 572ba53393..912fc021c5 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -72,6 +72,7 @@ public final class EmulationActivity extends Activity SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); if (prefs.getString("gpuPref", "Software Rendering").equals("OGL") && VideoSettingsFragment.SupportsGLES3() + && VideoSettingsFragment.m_GLVendor != null && VideoSettingsFragment.m_GLVendor.equals("Qualcomm")) NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth); else diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 7120742471..703b297248 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -190,6 +190,14 @@ public final class VideoSettingsFragment extends PreferenceFragment // Is a Tegra 4 since it supports 24bit depth mSupportsGLES3 = true; } + if (!mSupportsGLES3 && + m_GLVendor == null && + m_GLRenderer == null && + m_GLExtensions == null) + { + // Couldn't get information. Give them the benefit of the doubt + mSupportsGLES3 = true; + } return mSupportsGLES3; }