diff options
| author | Scott Mansell <phiren@gmail.com> | 2023-01-27 17:03:15 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2023-01-31 18:45:21 +1300 |
| commit | 0d4537d60f695e50379c1542d6c4b1e643e8a5a0 (patch) | |
| tree | 7c0dd9c2963b7eead104df5077444e3179030b4f /Source/Android/jni/MainAndroid.cpp | |
| parent | c38c76abad039c3c0ccb3f7ebb891dc62560f8a3 (diff) | |
Move Presenting, Dumping and ImGui out of Renderer
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 428870d02f..d305878f99 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -59,6 +59,7 @@ #include "UICommon/UICommon.h" #include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/Present.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" @@ -456,8 +457,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceChang if (s_surf == nullptr) __android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "Error: Surface is null."); - if (g_renderer) - g_renderer->ChangeSurface(s_surf); + if (g_presenter) + g_presenter->ChangeSurface(s_surf); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestroyed(JNIEnv*, @@ -483,8 +484,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestr std::lock_guard surface_guard(s_surface_lock); - if (g_renderer) - g_renderer->ChangeSurface(nullptr); + if (g_presenter) + g_presenter->ChangeSurface(nullptr); if (s_surf) { @@ -503,7 +504,7 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_HasSurfa JNIEXPORT jfloat JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameAspectRatio(JNIEnv*, jclass) { - return g_renderer->CalculateDrawAspectRatio(); + return g_presenter->CalculateDrawAspectRatio(); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimotes(JNIEnv*, jclass) |