From 134d967be2dd4ba9531abb8ba8494c3ac423ca72 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 3 Oct 2018 23:02:45 +1000 Subject: Refactoring and cleanup of GLInterface (now GLContext) --- Source/Android/jni/MainAndroid.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 4d230fca60..34a19f6426 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -22,7 +22,6 @@ #include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/FileUtil.h" -#include "Common/GL/GLInterfaceBase.h" #include "Common/Logging/LogManager.h" #include "Common/MsgHandler.h" #include "Common/Version.h" -- cgit v1.2.3 From a3961750a7174be7402fc492367f017d845b8e1f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 3 Oct 2018 23:03:13 +1000 Subject: Drop Host_GetRenderSurface and pass display to backend --- Source/Android/jni/MainAndroid.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 34a19f6426..83fefce338 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -89,11 +89,6 @@ void Host_Message(HostMessageID id) } } -void* Host_GetRenderHandle() -{ - return s_surf; -} - void Host_UpdateTitle(const std::string& title) { __android_log_write(ANDROID_LOG_INFO, DOLPHIN_TAG, title.c_str()); -- cgit v1.2.3 From eb284b5d661cab6aed770e0e51b790917249ef21 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 3 Oct 2018 23:03:22 +1000 Subject: VideoBackends: Pass window system info from host on creation --- Source/Android/jni/MainAndroid.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 83fefce338..5d3c03e767 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -25,6 +25,7 @@ #include "Common/Logging/LogManager.h" #include "Common/MsgHandler.h" #include "Common/Version.h" +#include "Common/WindowSystemInfo.h" #include "Core/Analytics.h" #include "Core/Boot/Boot.h" @@ -560,7 +561,8 @@ static void Run(const std::string& path, bool first_open, s_have_wm_user_stop = false; std::unique_ptr boot = BootParameters::GenerateFromFile(path, savestate_path); boot->delete_savestate = delete_savestate; - if (BootManager::BootCore(std::move(boot))) + WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf); + if (BootManager::BootCore(std::move(boot), wsi)) { static constexpr int TIMEOUT = 10000; static constexpr int WAIT_STEP = 25; -- cgit v1.2.3