disabling for Android "Vulkan Asynchronous Presentation"

CMakeLists.txt

@@ -177,7 +177,8 @@ option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
 # Re-allow on FreeBSD once its on mainline ports
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR APPLE" OFF)
 
-option(ENABLE_OPENGL "Enable OpenGL" ON)
+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
+mark_as_advanced(FORCE ENABLE_OPENGL)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)

src/android/app/build.gradle.kts

@@ -18,7 +18,6 @@ plugins {
     id("androidx.navigation.safeargs.kotlin")
     id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
     id("com.github.triplet.play") version "3.8.6"
-    id("idea")
 }
 
 /**
@@ -28,8 +27,6 @@ plugins {
  */
 val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
 
-val edenDir = project(":Eden").projectDir
-
 @Suppress("UnstableApiUsage")
 android {
     namespace = "org.yuzu.yuzu_emu"
@@ -244,17 +241,11 @@ android {
     externalNativeBuild {
         cmake {
             version = "3.22.1"
-            path = file("${edenDir}/CMakeLists.txt")
+            path = file("../../../CMakeLists.txt")
         }
     }
 }
 
-idea {
-    module {
-        // Inclusion to exclude build/ dir from non-Android
-        excludeDirs.add(file("${edenDir}/build"))
-    }
-}
 
 tasks.register<Delete>("ktlintReset", fun Delete.() {
     delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint"))
@@ -355,7 +346,7 @@ fun getGitVersion(): String {
 }
 
 afterEvaluate {
-    val artifactsDir = layout.projectDirectory.dir("${edenDir}/artifacts")
+    val artifactsDir = layout.projectDirectory.dir("../../../artifacts")
     val outputsDir = layout.buildDirectory.dir("outputs").get()
 
     android.applicationVariants.forEach { variant ->

src/android/settings.gradle.kts

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -22,6 +19,3 @@ dependencyResolutionManagement {
 }
 
 include(":app")
-
-include("Eden")
-project(":Eden").projectDir = file("../..")

src/common/settings.h

@@ -466,7 +466,7 @@ struct Values {
                                                    true};
     SwitchableSetting<bool> async_presentation{linkage,
 #ifdef ANDROID
-                                               true,
+                                               false,
 #else
                                                false,
 #endif

src/core/arm/nce/arm_nce.cpp

@@ -391,15 +391,28 @@ const std::size_t CACHE_PAGE_SIZE = 4096;
 
 void ArmNce::ClearInstructionCache() {
 #ifdef __aarch64__
-    // Ensure all previous memory operations complete
+    // Use IC IALLU to actually invalidate L1 instruction cache
     asm volatile("dsb ish\n"
+                 "ic iallu\n"
                  "dsb ish\n"
                  "isb" ::: "memory");
 #endif
 }
 
 void ArmNce::InvalidateCacheRange(u64 addr, std::size_t size) {
-    this->ClearInstructionCache();
+#ifdef ARCHITECTURE_arm64
+    // Invalidate instruction cache for specific range instead of full flush
+    constexpr u64 cache_line_size = 64;
+    const u64 aligned_addr = addr & ~(cache_line_size - 1);
+    const u64 end_addr = (addr + size + cache_line_size - 1) & ~(cache_line_size - 1);
+
+    asm volatile("dsb ish" ::: "memory");
+    for (u64 i = aligned_addr; i < end_addr; i += cache_line_size) {
+        asm volatile("ic ivau, %0" :: "r"(i) : "memory");
+    }
+    asm volatile("dsb ish\n"
+                 "isb" ::: "memory");
+#endif
 }
 
 } // namespace Core

src/dynarmic/tests/CMakeLists.txt

@@ -134,4 +134,4 @@ target_include_directories(dynarmic_tests PRIVATE . ../src)
 target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
 target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1)
 
-add_test(NAME dynarmic_tests COMMAND dynarmic_tests --durations yes)
+add_test(dynarmic_tests dynarmic_tests --durations yes)

src/video_core/vulkan_common/vulkan_instance.cpp

@@ -79,6 +79,9 @@ namespace {
 #endif
         if (enable_validation && AreExtensionsSupported(dld, *properties, std::array{VK_EXT_DEBUG_UTILS_EXTENSION_NAME}))
             extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
+        // VK_EXT_surface_maintenance1 is required for VK_EXT_swapchain_maintenance1
+        if (window_type != Core::Frontend::WindowSystemType::Headless && AreExtensionsSupported(dld, *properties, std::array{VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME}))
+            extensions.push_back(VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME);
     }
     return extensions;
 }