diff options
| author | Ryan Houdek <ryan.houdek@codethink.co.uk> | 2014-02-11 00:16:21 -0600 |
|---|---|---|
| committer | Ryan Houdek <ryan.houdek@codethink.co.uk> | 2014-02-22 21:08:27 -0600 |
| commit | 1f750904af5d2bd25467fea9dd79e22153cd2bb6 (patch) | |
| tree | 4dda3da5102103b902b05449ed07acf51990c768 /Source/Core | |
| parent | f9ed70b2f9d37bfa4347125ef345cd1ff97209b7 (diff) | |
Fix the OpenGL About tab.
Move EGLHelper to be local to the creation of the about GL/GLES tabs so we don't have 3 EGL contexts running at a time.
Fix issues with OpenGL context creation here so we show the correct information.
This requires adding an EGL function to the NativeLibrary since Android's JAVA bindings don't expose eglBindAPI.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 3d3b052a09..23c6014333 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -21,6 +21,7 @@ #include <jni.h> #include <android/log.h> #include <android/native_window_jni.h> +#include <EGL/egl.h> #include "Android/ButtonManager.h" #include "Common/Common.h" @@ -297,6 +298,11 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenSh Core::SaveScreenShot(); } +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv *env, jobject obj, jint api) +{ + eglBindAPI(api); +} + JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault) { IniFile ini; |