diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2018-10-24 14:51:21 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 14:51:21 +1100 |
| commit | c4d1e4adffcd380cc87b841069ce2fe8b62d7b60 (patch) | |
| tree | c61a0a07c14ccc3c1f7247bdcc82927a82c145bb /Source/Android | |
| parent | 9c9d598ec006527bc47aea306e5171d03c12c5f5 (diff) | |
| parent | 2c6d96433c322b50470705d43005fd6308506d49 (diff) | |
Merge pull request #7450 from stenzek/glcontext
GLInterface refactoring/cleanup and runtime platform selection
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 4d230fca60..5d3c03e767 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -22,10 +22,10 @@ #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" +#include "Common/WindowSystemInfo.h" #include "Core/Analytics.h" #include "Core/Boot/Boot.h" @@ -90,11 +90,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()); @@ -566,7 +561,8 @@ static void Run(const std::string& path, bool first_open, s_have_wm_user_stop = false; std::unique_ptr<BootParameters> 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; |