diff options
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java | 1 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java | 20 |
2 files changed, 20 insertions, 1 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index 95cddc0a30..572ba53393 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -76,7 +76,6 @@ public final class EmulationActivity extends Activity NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth); else NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight); - NativeLibrary.SetFilename(gameToEmulate.getStringExtra("SelectedGame")); Running = true; diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 498e6607b1..7120742471 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -27,6 +27,7 @@ public final class VideoSettingsFragment extends PreferenceFragment public static String m_GLVersion; public static String m_GLVendor; public static String m_GLRenderer; + public static String m_GLExtensions; private Activity m_activity; /** @@ -104,6 +105,16 @@ public final class VideoSettingsFragment extends PreferenceFragment return mGL.glGetString(GL10.GL_RENDERER); } + /** + * Gets the extension that the device supports + * + * @return String containing the extensions + */ + public String getExtensions() + { + return mGL.glGetString(GL10.GL_EXTENSIONS); + } + private EGLConfig chooseConfig() { int[] attribList = new int[] { @@ -139,6 +150,7 @@ public final class VideoSettingsFragment extends PreferenceFragment m_GLVersion = mbuffer.getVersion(); m_GLVendor = mbuffer.getVendor(); m_GLRenderer = mbuffer.getRenderer(); + m_GLExtensions = mbuffer.getExtensions(); boolean mSupportsGLES3 = false; @@ -170,6 +182,14 @@ public final class VideoSettingsFragment extends PreferenceFragment mSupportsGLES3 = true; } } + if (!mSupportsGLES3 && + m_GLVendor != null && m_GLVendor.equals("NVIDIA Corporation") && + m_GLRenderer != null && m_GLRenderer.equals("NVIDIA Tegra") && + m_GLExtensions != null && m_GLExtensions.contains("GL_OES_depth24")) + { + // Is a Tegra 4 since it supports 24bit depth + mSupportsGLES3 = true; + } return mSupportsGLES3; } |