summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2018-10-03 23:03:22 +1000
committerStenzek <stenzek@gmail.com>2018-10-20 21:11:34 +1000
commiteb284b5d661cab6aed770e0e51b790917249ef21 (patch)
treeafad7299617c4788598e05a347ead4e1af5650ee /Source/Android/jni/MainAndroid.cpp
parent9c57a98723997736adea94383668fbdf8a993fd8 (diff)
VideoBackends: Pass window system info from host on creation
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp4
1 files changed, 3 insertions, 1 deletions
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<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;