From 86db015c232c301575801ea6d90225af46bd9c6c Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 11 Mar 2020 23:09:28 +1000 Subject: Common: Add a render_window field to WindowSystemInfo We need this because we need to pass the layer to MoltenVK, not the view handle. But the input subsystem still needs the window. --- Source/Android/jni/MainAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 2b8b91de74..9b081b9ad1 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -680,7 +680,7 @@ static void Run(JNIEnv* env, const std::vector& paths, s_have_wm_user_stop = false; std::unique_ptr boot = BootParameters::GenerateFromFile(paths, savestate_path); boot->delete_savestate = delete_savestate; - WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf); + WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf, s_surf); wsi.render_surface_scale = GetRenderSurfaceScale(env); if (BootManager::BootCore(std::move(boot), wsi)) { -- cgit v1.2.3