waw

fix?
use only __linux__
2026-06-06 07:25:52 +08:00 · 2026-06-03 05:02:57 +02:00 · 2026-06-03 05:02:57 +02:00 · 2026-06-03 05:02:57 +02:00 · 2026-06-03 05:02:57 +02:00 · 2026-06-03 05:02:57 +02:00
58 changed files with 259 additions and 188 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -306,7 +306,7 @@ if (YUZU_ROOM)
    add_compile_definitions(YUZU_ROOM)
 endif()

-if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
+if (UNIX AND NOT (PLATFORM_LINUX OR WIN32))
    if(CXX_APPLE OR CXX_CLANG)
        # libc++ has stop_token and jthread as experimental
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@ -512,7 +512,7 @@ endfunction()
 # =============================================

 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
        find_library(${fw}_LIBRARY ${fw} REQUIRED)
        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
    endforeach()
@ -524,6 +524,8 @@ elseif (WIN32)
        # PSAPI is the Process Status API
        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
    endif()
+elseif (PLATFORM_MANAGARM)
+    set(PLATFORM_LIBRARIES iconv intl)
 elseif (PLATFORM_HAIKU)
    # Haiku is so special :)
    set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
--- a/docs/Debug.md
+++ b/docs/Debug.md
@ -69,29 +69,6 @@ Expressions can be `variable_names` or `1234` (numbers) or `*var` (dereference o

 For more information type `info gdb` and read [the man page](https://man7.org/linux/man-pages/man1/gdb.1.html).

-## Simple checklist for debugging black screens using Renderdoc
+# RenderDoc (Graphic Debugging Tool)

-Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
-
-Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
-
-When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
-Here is a short checklist of items to look at to make sure are appropriate:
-
- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
- Vertex buffers are bound
- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
- Any bound push constants and descriptors have the right data - including:
-  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
- Pipeline state is correct
-  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
-  - Fill mode matches expected - usually solid
-  - Culling mode makes sense - commonly back or none
-  - The winding direction is correct - typically CCW (counter clockwise)
-  - Scissor region is correct - usually same as viewport's x,y,width, &height
- Blend state is correct
- Depth state is correct - typically enabled with Function set to Less than or Equal
- Swapchain images are bound when rendering to the swapchain
- Image being rendered to is the same as the one being presented when rendering to the swapchain
-
-Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.
+Guidelines for graphical debugging using RenderDoc: **[RenderDoc usage](./RenderDoc.md)**
--- a/docs/README.md
+++ b/docs/README.md
@ -12,6 +12,7 @@ This contains documentation created by developers. This contains build instructi
 - **[Development Guidelines](./Development.md)**
 - **[Dependencies](./Deps.md)**
 - **[Debug Guidelines](./Debug.md)**
+- **[RenderDoc usage](./RenderDoc.md)**
 - **[CPM - CMake Package Manager](./CPMUtil)**
 - **[Platform-Specific Caveats](./Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
--- a/docs/RenderDoc.md
+++ b/docs/RenderDoc.md
@ -0,0 +1,52 @@
+# RenderDoc
+
+Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
+
+RenderDoc can capture Eden's Vulkan output when its Vulkan layer is loaded before Eden creates the Vulkan device. Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
+
+## Usage on Windows 
+
+You can either use RenderDoc UI to launch eden, or you can make eden attach it internally:
+
+On Windows PowerShell:
+```powershell
+$env:ENABLE_VULKAN_RENDERDOC_CAPTURE='1'
+.\eden.exe
+```
+When RenderDoc is attached, Eden logs the default Windows capture folder:
+```text
+%LOCALAPPDATA%\Temp\RenderDoc
+```
+
+Press RenderDoc's capture hotkey, usually `F12`, to capture a frame. To stop using RenderDoc, close Eden and launch it again without `ENABLE_VULKAN_RENDERDOC_CAPTURE`.
+
+## Eden Hotkey
+
+Eden also has a separate `Toggle Renderdoc Capture` hotkey behind the debug setting `renderdoc_hotkey`.
+That hotkey does not load or unload RenderDoc. It only toggles Eden's own manual capture through RenderDoc's API:
+
+- first press: starts a capture
+- second press: ends that capture
+
+## Simple checklist for debugging black screens using Renderdoc
+
+When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
+Here is a short checklist of items to look at to make sure are appropriate:
+
+- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
+- Vertex buffers are bound
+- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
+- Any bound push constants and descriptors have the right data - including:
+  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
+- Pipeline state is correct
+  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
+  - Fill mode matches expected - usually solid
+  - Culling mode makes sense - commonly back or none
+  - The winding direction is correct - typically CCW (counter clockwise)
+  - Scissor region is correct - usually same as viewport's x,y,width, &height
+- Blend state is correct
+- Depth state is correct - typically enabled with Function set to Less than or Equal
+- Swapchain images are bound when rendering to the swapchain
+- Image being rendered to is the same as the one being presented when rendering to the swapchain
+
+Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.
--- a/src/common/cpu_features.cpp
+++ b/src/common/cpu_features.cpp
@ -303,7 +303,7 @@ namespace {
 }
 [[nodiscard]] s64 GetHostCNTFRQ() noexcept {
    u64 cntfrq_el0 = 0;
-#ifdef ANDROID
+#ifdef __ANDROID__
    std::string_view board{""};
    char buffer[PROP_VALUE_MAX];
    int len{__system_property_get("ro.product.board", buffer)};
--- a/src/common/error.cpp
+++ b/src/common/error.cpp
@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@ -30,7 +33,7 @@ std::string NativeErrorToString(int e) {
    return ret;
 #else
    char err_str[255];
-#if defined(ANDROID) ||                                                                            \
+#if defined(__ANDROID__) ||                                                                            \
    (defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)))
    // Thread safe (GNU-specific)
    const char* str = strerror_r(e, err_str, sizeof(err_str));
--- a/src/common/fs/file.cpp
+++ b/src/common/fs/file.cpp
@ -9,7 +9,7 @@
 #include "common/assert.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif
 #include "common/logging.h"
@ -259,7 +259,7 @@ void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, File
    } else {
        _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
    }
-#elif ANDROID
+#elif __ANDROID__
    if (Android::IsContentUri(path)) {
        ASSERT_MSG(mode == FileAccessMode::Read, "Content URI file access is for read-only!");
        const auto fd = Android::OpenContentUri(path, Android::OpenMode::Read);
@ -396,7 +396,7 @@ u64 IOFile::GetSize() const {
    // Flush any unwritten buffered data into the file prior to retrieving the file size.
    std::fflush(file);

-#if ANDROID
+#ifdef __ANDROID__
    u64 file_size = 0;
    if (Android::IsContentUri(file_path)) {
        file_size = Android::GetSize(file_path);
--- a/src/common/fs/fs.cpp
+++ b/src/common/fs/fs.cpp
@ -6,7 +6,7 @@

 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif
 #include "common/fs/path_util.h"
@ -532,7 +532,7 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path,

 bool Exists(const fs::path& path) {
    std::error_code ec;
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Android::IsContentUri(path)) {
        return Android::Exists(path);
    } else {
@ -545,7 +545,7 @@ bool Exists(const fs::path& path) {

 bool IsFile(const fs::path& path) {
    std::error_code ec;
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Android::IsContentUri(path)) {
        return !Android::IsDirectory(path);
    } else {
@ -558,7 +558,7 @@ bool IsFile(const fs::path& path) {

 bool IsDir(const fs::path& path) {
    std::error_code ec;
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Android::IsContentUri(path)) {
        return Android::IsDirectory(path);
    } else {
@ -611,7 +611,7 @@ fs::file_type GetEntryType(const fs::path& path) {
 }

 u64 GetSize(const fs::path& path) {
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Android::IsContentUri(path)) {
        return Android::GetSize(path);
    }
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@ -11,7 +11,7 @@

 #include "common/assert.h"
 #include "common/fs/fs.h"
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif
 #include "common/fs/fs_paths.h"
@ -126,7 +126,7 @@ public:
        LEGACY_PATH(Yuzu, YUZU)
        LEGACY_PATH(Suyu, SUYU)
 #undef LEGACY_PATH
-#elif ANDROID
+#elif __ANDROID__
        ASSERT(!eden_path.empty());
        eden_path_cache = eden_path / CACHE_DIR;
        eden_path_config = eden_path / CONFIG_DIR;
@ -447,11 +447,11 @@ std::vector<std::string> SplitPathComponentsCopy(std::string_view filename) {

 std::string SanitizePath(std::string_view path_, DirectorySeparator directory_separator) {
    std::string path(path_);
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Android::IsContentUri(path)) {
        return path;
    }
-#endif // ANDROID
+#endif // __ANDROID__

    char type1 = directory_separator == DirectorySeparator::BackwardSlash ? '/' : '\\';
    char type2 = directory_separator == DirectorySeparator::BackwardSlash ? '\\' : '/';
@ -482,7 +482,7 @@ std::string GetParentPath(std::string_view path) {
        return std::string(path);
    }

-#ifdef ANDROID
+#ifdef __ANDROID__
    if (path[0] != '/') {
        std::string path_string{path};
        return FS::Android::GetParentDirectory(path_string);
--- a/src/common/logging.cpp
+++ b/src/common/logging.cpp
@ -320,7 +320,7 @@ struct DebuggerBackend final : public Backend {
    void Flush() noexcept override {}
 };
 #endif
-#ifdef ANDROID
+#ifdef __ANDROID__
 /// @brief Backend that writes to the Android logcat
 struct LogcatBackend : public Backend {
    explicit LogcatBackend() noexcept = default;
@ -359,7 +359,7 @@ struct Impl {
 #ifdef _WIN32
        lambda(static_cast<Backend&>(debugger_backend));
 #endif
-#ifdef ANDROID
+#ifdef __ANDROID__
        lambda(static_cast<Backend&>(lc_backend));
 #endif
    }
@ -372,7 +372,7 @@ struct Impl {
 #ifdef _WIN32
    DebuggerBackend debugger_backend{};
 #endif
-#ifdef ANDROID
+#ifdef __ANDROID__
    LogcatBackend lc_backend{};
 #endif
    std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
--- a/src/common/settings.h
+++ b/src/common/settings.h
@ -359,7 +359,7 @@ struct Values {
                                                    true,
                                                    true};
    SwitchableSetting<int, true> fsr_sharpening_slider{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                                       0,
 #else
                                                       25,
@ -417,7 +417,7 @@ struct Values {
                                         linkage, 0, "bg_blue", Category::Renderer, Specialization::Default, true, true};

    SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                                      GpuAccuracy::Low,
 #else
                                                      GpuAccuracy::Medium,
@ -447,7 +447,7 @@ struct Values {
                                                      "nvdec_emulation", Category::RendererAdvanced};

    SwitchableSetting<AnisotropyMode, true> max_anisotropy{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                                           AnisotropyMode::Default,
 #else
                                                           AnisotropyMode::Automatic,
@ -500,7 +500,7 @@ struct Values {
                                                Category::RendererAdvanced};

    SwitchableSetting<bool> use_reactive_flushing{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                                  false,
 #else
                                                  true,
@ -519,7 +519,7 @@ struct Values {
                                                  true,
                                                  true};

-#ifdef ANDROID
+#ifdef __ANDROID__
    SwitchableSetting<bool> use_optimized_vertex_buffers{linkage,
                                                 false,
                                                 "use_optimized_vertex_buffers",
@ -553,7 +553,7 @@ struct Values {
                                        true,
                                        true};
    SwitchableSetting<bool> async_presentation{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                               false,
 #else
                                               false,
@ -599,7 +599,7 @@ struct Values {
                                                  Category::RendererHacks};

    SwitchableSetting<ExtendedDynamicState> dyna_state{linkage,
-#if defined(ANDROID)
+#if defined(__ANDROID__)
                                           ExtendedDynamicState::Disabled,
 #elif defined(__APPLE__)
                                           ExtendedDynamicState::Disabled,
@ -618,7 +618,7 @@ struct Values {
                                                Specialization::Scalar};

    SwitchableSetting<bool> vertex_input_dynamic_state{linkage,
-#if defined (ANDROID)
+#ifdef __ANDROID__
                                                       false,
 #else
                                                       true,
@ -634,7 +634,7 @@ struct Values {
                                                    linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
    Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey",
                                          Category::RendererDebug};
-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
    // Debug override for automatic BCn patching detection
    Setting<bool> patch_old_qcom_drivers{linkage, false, "patch_old_qcom_drivers",
                                         Category::RendererDebug};
@ -679,7 +679,7 @@ struct Values {
    Setting<s32> current_user{linkage, 0, "current_user", Category::System};

    SwitchableSetting<ConsoleMode> use_docked_mode{linkage,
-#ifdef ANDROID
+#ifdef __ANDROID__
                                                   ConsoleMode::Handheld,
 #else
                                                   ConsoleMode::Docked,
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
@ -18,7 +18,7 @@
 #include <windows.h>
 #endif

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <common/fs/fs_android.h>
 #endif

@ -45,7 +45,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
    if (full_path.empty())
        return false;

-#ifdef ANDROID
+#ifdef __ANDROID__
    if (full_path[0] != '/') {
        *_pPath = Common::FS::Android::GetParentDirectory(full_path);
        *_pFilename = Common::FS::Android::GetFilename(full_path);
--- a/src/common/swap.h
+++ b/src/common/swap.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2012 PPSSPP Project
@ -10,12 +10,10 @@

 #pragma once

-#if defined(_MSC_VER)
 #include <cstdlib>
-#endif
-#include <bit>
 #include <cstring>
 #include <type_traits>
+#include <bit>
 #include "common/common_types.h"

 namespace Common {
--- a/src/core/debugger/debugger.cpp
+++ b/src/core/debugger/debugger.cpp
@ -9,7 +9,7 @@
 #include <boost/asio.hpp>
 #include <boost/version.hpp>

-#if BOOST_VERSION > 108400 && (!defined(_WINDOWS) && !defined(ANDROID)) || defined(YUZU_BOOST_v1)
+#if BOOST_VERSION > 108400 && (!defined(_WINDOWS) && !defined(__ANDROID__)) || defined(YUZU_BOOST_v1)
 #define USE_BOOST_v1
 #endif

--- a/src/core/file_sys/vfs/vfs_real.cpp
+++ b/src/core/file_sys/vfs/vfs_real.cpp
@ -23,7 +23,7 @@
 #define stat _stat64
 #endif

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif

@ -288,7 +288,7 @@ RealVfsFile::~RealVfsFile() {
 }

 std::string RealVfsFile::GetName() const {
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (path[0] != '/') {
        return FS::Android::GetFilename(path);
    }
--- a/src/core/tools/renderdoc.cpp
+++ b/src/core/tools/renderdoc.cpp
@ -31,7 +31,7 @@ RenderdocAPI::RenderdocAPI() {
 #elif defined(__HAIKU__)
    // no rtld on haiku
 #else
-#ifdef ANDROID
+#ifdef __ANDROID__
    static constexpr const char RENDERDOC_LIB[] = "libVkLayer_GLES_RenderDoc.so";
 #else
    static constexpr const char RENDERDOC_LIB[] = "librenderdoc.so";
--- a/src/dynarmic/src/dynarmic/backend/x64/devirtualize.h
+++ b/src/dynarmic/src/dynarmic/backend/x64/devirtualize.h
@ -75,7 +75,7 @@ ArgCallback DevirtualizeItanium(mcl::class_type<decltype(mfp)>* this_) {

 template<auto mfp>
 ArgCallback Devirtualize(mcl::class_type<decltype(mfp)>* this_) {
-#if defined(__APPLE__) || defined(linux) || defined(__linux) || defined(__linux__)
+#if defined(__APPLE__) || defined(__linux__)
    return DevirtualizeItanium<mfp>(this_);
 #elif defined(__MINGW64__)
    return DevirtualizeItanium<mfp>(this_);
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
@ -1009,7 +1009,7 @@ std::string Config::AdjustOutputString(const std::string& string) {

    // Windows requires that two forward slashes are used at the start of a path for unmapped
    // network drives so we have to watch for that here
-#ifndef ANDROID
+#ifndef __ANDROID__
    if (string.substr(0, 2) == "//") {
        boost::replace_all(adjusted_string, "//", "/");
        adjusted_string.insert(0, "/");
--- a/src/frontend_common/data_manager.h
+++ b/src/frontend_common/data_manager.h
@ -1,8 +1,7 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef DATA_MANAGER_H
-#define DATA_MANAGER_H
+#pragma once

 #include "common/common_types.h"
 #include <string>
@ -21,5 +20,3 @@ std::string ReadableBytesSize(u64 size) noexcept;
 u64 DataDirSize(DataDir dir);

 }; // namespace FrontendCommon::DataManager
-
-#endif // DATA_MANAGER_H
--- a/src/frontend_common/firmware_manager.cpp
+++ b/src/frontend_common/firmware_manager.cpp
@ -13,7 +13,7 @@
 #include "core/crypto/key_manager.h"
 #include "frontend_common/content_manager.h"

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <jni.h>
 #include <common/android/id_cache.h>
 #include <common/android/android_common.h>
@ -25,7 +25,7 @@ FirmwareManager::InstallKeys(std::string location, std::string extension) {

    const auto keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir);

-#ifdef ANDROID
+#ifdef __ANDROID__
    JNIEnv *env = Common::Android::GetEnvForThread();

    jstring jsrc = Common::Android::ToJString(env, location);
--- a/src/frontend_common/firmware_manager.h
+++ b/src/frontend_common/firmware_manager.h
@ -1,8 +1,7 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef FIRMWARE_MANAGER_H
-#define FIRMWARE_MANAGER_H
+#pragma once

 #include "common/common_types.h"
 #include "core/core.h"
@ -107,5 +106,3 @@ inline std::pair<Service::Set::FirmwareVersionFormat, Result> GetFirmwareVersion

 // TODO(crueter): GET AS STRING
 }
-
-#endif
--- a/src/frontend_common/mod_manager.h
+++ b/src/frontend_common/mod_manager.h
@ -5,6 +5,7 @@

 #include <filesystem>
 #include <optional>
+#include <vector>
 #include "common/common_types.h"

 namespace FrontendCommon {
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@ -179,7 +179,7 @@ void EmulatedController::LoadDevices() {
    if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
        camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
        nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
-#ifndef ANDROID
+#ifndef __ANDROID__
        ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
 #else
        android_params = Common::ParamPackage{"engine:android,port:100"};
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@ -30,7 +30,7 @@
 #include "input_common/drivers/sdl_driver.h"
 #endif

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "input_common/drivers/android.h"
 #endif

@ -85,7 +85,7 @@ struct InputSubsystem::Impl {
        RegisterEngine("cemuhookudp", udp_client);
        RegisterEngine("tas", tas_input);
        RegisterEngine("camera", camera);
-#ifdef ANDROID
+#ifdef __ANDROID__
        RegisterEngine("android", android);
 #endif
        RegisterEngine("virtual_amiibo", virtual_amiibo);
@ -119,7 +119,7 @@ struct InputSubsystem::Impl {
        UnregisterEngine(udp_client);
        UnregisterEngine(tas_input);
        UnregisterEngine(camera);
-#ifdef ANDROID
+#ifdef __ANDROID__
        UnregisterEngine(android);
 #endif
        UnregisterEngine(virtual_amiibo);
@ -138,13 +138,13 @@ struct InputSubsystem::Impl {
            Common::ParamPackage{{"display", "Any"}, {"engine", "any"}},
        };

-#ifndef ANDROID
+#ifndef __ANDROID__
        auto keyboard_devices = keyboard->GetInputDevices();
        devices.insert(devices.end(), keyboard_devices.begin(), keyboard_devices.end());
        auto mouse_devices = mouse->GetInputDevices();
        devices.insert(devices.end(), mouse_devices.begin(), mouse_devices.end());
 #endif
-#ifdef ANDROID
+#ifdef __ANDROID__
        auto android_devices = android->GetInputDevices();
        devices.insert(devices.end(), android_devices.begin(), android_devices.end());
 #endif
@ -176,7 +176,7 @@ struct InputSubsystem::Impl {
        if (engine == mouse->GetEngineName()) {
            return mouse;
        }
-#ifdef ANDROID
+#ifdef __ANDROID__
        if (engine == android->GetEngineName()) {
            return android;
        }
@ -261,7 +261,7 @@ struct InputSubsystem::Impl {
        if (engine == mouse->GetEngineName()) {
            return true;
        }
-#ifdef ANDROID
+#ifdef __ANDROID__
        if (engine == android->GetEngineName()) {
            return true;
        }
@ -294,7 +294,7 @@ struct InputSubsystem::Impl {
    void BeginConfiguration() {
        keyboard->BeginConfiguration();
        mouse->BeginConfiguration();
-#ifdef ANDROID
+#ifdef __ANDROID__
        android->BeginConfiguration();
 #endif
 #ifdef ENABLE_LIBUSB
@ -310,7 +310,7 @@ struct InputSubsystem::Impl {
    void EndConfiguration() {
        keyboard->EndConfiguration();
        mouse->EndConfiguration();
-#ifdef ANDROID
+#ifdef __ANDROID__
        android->EndConfiguration();
 #endif
 #ifdef ENABLE_LIBUSB
@ -355,7 +355,7 @@ struct InputSubsystem::Impl {
    std::shared_ptr<Joycons> joycon;
 #endif

-#ifdef ANDROID
+#ifdef __ANDROID__
    std::shared_ptr<Android> android;
 #endif
 };
@ -412,7 +412,7 @@ const Camera* InputSubsystem::GetCamera() const {
    return impl->camera.get();
 }

-#ifdef ANDROID
+#ifdef __ANDROID__
 Android* InputSubsystem::GetAndroid() {
    return impl->android.get();
 }
--- a/src/qt_common/abstract/frontend.h
+++ b/src/qt_common/abstract/frontend.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef FRONTEND_H
-#define FRONTEND_H
+#pragma once

 #include <QGuiApplication>
 #include "qt_common/qt_common.h"
@ -114,4 +113,3 @@ const QString GetTextInput(const QString& title = QString(), const QString& capt
                           const QString& defaultText = QString());

 } // namespace QtCommon::Frontend
-#endif // FRONTEND_H
--- a/src/qt_common/qt_common.h
+++ b/src/qt_common/qt_common.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_COMMON_H
-#define QT_COMMON_H
+#pragma once

 #include <memory>
 #include <QWindow>
@ -62,4 +61,3 @@ const QString tr(const std::string& str);

 std::filesystem::path GetEdenCommand();
 } // namespace QtCommon
-#endif
--- a/src/qt_common/util/applet.h
+++ b/src/qt_common/util/applet.h
@ -1,9 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_APPLET_UTIL_H
-#define QT_APPLET_UTIL_H
+#pragma once

 // TODO
 namespace QtCommon::Applets {}
-#endif // QT_APPLET_UTIL_H
--- a/src/qt_common/util/content.h
+++ b/src/qt_common/util/content.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_CONTENT_UTIL_H
-#define QT_CONTENT_UTIL_H
+#pragma once

 #include <QObject>
 #include "common/common_types.h"
@ -63,4 +62,3 @@ void configureFilesystemProvider(const std::string& filepath);
 // Profiles //
 void FixProfiles();
 } // namespace QtCommon::Content
-#endif // QT_CONTENT_UTIL_H
--- a/src/qt_common/util/fs.h
+++ b/src/qt_common/util/fs.h
@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

+#pragma once
+
 #include <filesystem>
 #include <optional>
 #include "common/common_types.h"

-#pragma once
-
 namespace QtCommon::FS {

 void LinkRyujinx(std::filesystem::path& from, std::filesystem::path& to);
--- a/src/qt_common/util/game.h
+++ b/src/qt_common/util/game.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_GAME_UTIL_H
-#define QT_GAME_UTIL_H
+#pragma once

 #include <QObject>
 #include <QStandardPaths>
@ -78,5 +77,3 @@ void CreateHomeMenuShortcut(ShortcutTarget target);
 [[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);

 } // namespace QtCommon::Game
-
-#endif // QT_GAME_UTIL_H
--- a/src/qt_common/util/meta.h
+++ b/src/qt_common/util/meta.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_META_H
-#define QT_META_H
+#pragma once

 #include <QObject>

@ -12,4 +11,3 @@ namespace QtCommon::Meta {
 void RegisterMetaTypes();

 } // namespace QtCommon::Meta
-#endif // QT_META_H
--- a/src/qt_common/util/path.h
+++ b/src/qt_common/util/path.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_PATH_UTIL_H
-#define QT_PATH_UTIL_H
+#pragma once

 #include <QObject>
 #include "common/common_types.h"
@ -10,5 +9,3 @@
 namespace QtCommon::Path {
 bool OpenShaderCache(u64 program_id, QObject* parent);
 }
-
-#endif // QT_PATH_UTIL_H
--- a/src/qt_common/util/rom.h
+++ b/src/qt_common/util/rom.h
@ -1,16 +1,11 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef QT_ROM_UTIL_H
-#define QT_ROM_UTIL_H
+#pragma once

 #include <cstddef>
 #include "qt_common/qt_common.h"

 namespace QtCommon::ROM {
-
-bool RomFSRawCopy(size_t total_size, size_t& read_size, QtProgressCallback callback,
-                  const FileSys::VirtualDir& src, const FileSys::VirtualDir& dest, bool full);
-
+bool RomFSRawCopy(size_t total_size, size_t& read_size, QtProgressCallback callback, const FileSys::VirtualDir& src, const FileSys::VirtualDir& dest, bool full);
 }
-#endif // QT_ROM_UTIL_H
--- a/src/shader_recompiler/backend/spirv/emit_spirv_convert.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_convert.cpp
@ -151,7 +151,7 @@ Id EmitConvertU32U64(EmitContext& ctx, Id value) {
 }

 Id EmitConvertF16F32(EmitContext& ctx, Id value) {
-#ifdef ANDROID
+#ifdef __ANDROID__
    return ctx.OpFConvert(ctx.F16[1], value);
 #else
    const auto result = ctx.OpFConvert(ctx.F16[1], value);
--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
@ -506,7 +506,7 @@ Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value&
    Id result = Emit(&EmitContext::OpImageSparseSampleExplicitLod,
                     &EmitContext::OpImageSampleExplicitLod, ctx, inst, ctx.F32[4],
                     Texture(ctx, info, index), coords, operands.Mask(), operands.Span());
-#ifdef ANDROID
+#ifdef __ANDROID__
    if (Settings::values.fix_bloom_effects.GetValue()) {
        result = ctx.OpVectorTimesScalar(ctx.F32[4], result, ctx.Const(0.98f));
    }
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@ -801,7 +801,7 @@ void BufferCache<P>::UpdateVertexBufferSlot(u32 index, const Binding& binding) {
 template <class P>
 void BufferCache<P>::BindHostVertexBuffers() {

-#ifdef ANDROID
+#ifdef __ANDROID__
    const bool use_optimized_vertex_buffers = Settings::values.use_optimized_vertex_buffers.GetValue();
 #else
    constexpr bool use_optimized_vertex_buffers = true;
--- a/src/video_core/gpu_logging/freedreno_debug.cpp
+++ b/src/video_core/gpu_logging/freedreno_debug.cpp
@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifdef ANDROID
+#ifdef __ANDROID__

 #include "video_core/gpu_logging/freedreno_debug.h"
 #include "common/logging.h"
@ -49,4 +49,4 @@ std::string FreedrenoDebugger::GetBreadcrumbs() {

 } // namespace GPU::Logging::Freedreno

-#endif // ANDROID
+#endif // __ANDROID__
--- a/src/video_core/gpu_logging/freedreno_debug.h
+++ b/src/video_core/gpu_logging/freedreno_debug.h
@ -3,7 +3,7 @@

 #pragma once

-#ifdef ANDROID
+#ifdef __ANDROID__

 #include <string>

@ -29,4 +29,4 @@ private:

 } // namespace GPU::Logging::Freedreno

-#endif // ANDROID
+#endif // __ANDROID__
--- a/src/video_core/host1x/ffmpeg.cpp
+++ b/src/video_core/host1x/ffmpeg.cpp
@ -28,7 +28,7 @@ namespace {
 constexpr AVPixelFormat PreferredGpuFormat = AV_PIX_FMT_NV12;
 constexpr AVPixelFormat PreferredCpuFormat = AV_PIX_FMT_YUV420P;
 constexpr std::array PreferredGpuDecoders = {
-#if defined (_WIN32)
+#if defined(_WIN32)
    AV_HWDEVICE_TYPE_CUDA,
    AV_HWDEVICE_TYPE_D3D11VA,
    AV_HWDEVICE_TYPE_DXVA2,
@ -39,7 +39,7 @@ constexpr std::array PreferredGpuDecoders = {
    AV_HWDEVICE_TYPE_DRM,
 #elif defined(__APPLE__)
    AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-#elif defined(ANDROID)
+#elif defined(__ANDROID__)
    AV_HWDEVICE_TYPE_MEDIACODEC,
 #elif defined(__unix__)
    AV_HWDEVICE_TYPE_CUDA,
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@ -45,7 +45,7 @@
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 #include "video_core/gpu_logging/gpu_logging.h"

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include "../../android/app/src/main/jni/android_settings.h"
 #endif

@ -328,7 +328,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> program
 size_t GetTotalPipelineWorkers() {
    const size_t max_core_threads =
        std::max<size_t>(static_cast<size_t>(std::thread::hardware_concurrency()), 2ULL) - 1ULL;
-#ifdef ANDROID
+#ifdef __ANDROID__
    const int configured = AndroidSettings::values.pipeline_worker_count.GetValue();
    const int clamped = std::clamp(configured, 4, 8);
    const size_t desired = static_cast<size_t>(clamped);
--- a/src/video_core/renderer_vulkan/vk_present_manager.cpp
+++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp
@ -309,7 +309,7 @@ void PresentManager::CopyToSwapchain(Frame* frame) {
        try {
            // Recreate surface and swapchain if needed.
            if (requires_recreation) {
-#ifdef ANDROID
+#ifdef __ANDROID__
                surface = CreateSurface(instance, render_window.GetWindowInfo());
 #endif
                RecreateSwapchain(frame);
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@ -928,13 +928,13 @@ void RasterizerVulkan::LoadDiskResources(u64 title_id, std::stop_token stop_load
 }

 void RasterizerVulkan::FlushWork() {
-#ifdef ANDROID
+#ifdef __ANDROID__
    static constexpr u32 DRAWS_TO_DISPATCH = 512;
    static constexpr u32 CHECK_MASK = 3;
 #else
    static constexpr u32 DRAWS_TO_DISPATCH = 4096;
    static constexpr u32 CHECK_MASK = 7;
-#endif // ANDROID
+#endif // __ANDROID__

    static_assert(DRAWS_TO_DISPATCH % (CHECK_MASK + 1) == 0);
    if ((++draw_counter & CHECK_MASK) != CHECK_MASK) {
--- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
+++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
@ -31,11 +31,18 @@ constexpr VkDeviceSize MAX_ALIGNMENT = 256;
 constexpr VkDeviceSize MAX_STREAM_BUFFER_SIZE = 128_MiB;

 size_t GetStreamBufferSize(const Device& device) {
+    if (!device.HasDebuggingToolAttached()) {
+        return MAX_STREAM_BUFFER_SIZE;
+    }
+
    VkDeviceSize size{0};
-    if (device.HasDebuggingToolAttached()) {
-        ForEachDeviceLocalHostVisibleHeap(device, [&size](size_t index, VkMemoryHeap& heap) {
-            size = (std::max)(size, heap.size);
-        });
+    bool has_device_local_host_visible_heap{};
+    ForEachDeviceLocalHostVisibleHeap(device, [&size, &has_device_local_host_visible_heap](
+                                                  size_t index, VkMemoryHeap& heap) {
+        has_device_local_host_visible_heap = true;
+        size = (std::max)(size, heap.size);
+    });
+    if (has_device_local_host_visible_heap) {
        // If rebar is not supported, cut the max heap size to 40%. This will allow 2 captures to be
        // loaded at the same time in RenderDoc. If rebar is supported, this shouldn't be an issue
        // as the heap will be much larger.
--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp
+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp
@ -288,7 +288,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities) {
        .imageSharingMode = VK_SHARING_MODE_EXCLUSIVE,
        .queueFamilyIndexCount = 0,
        .pQueueFamilyIndices = nullptr,
-#ifdef ANDROID
+#ifdef __ANDROID__
        // On Android, do not allow surface rotation to deviate from the frontend.
        .preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR,
 #else
@ -313,7 +313,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities) {
        swapchain_ci.imageFormat,  // Base format MUST be first
        VK_FORMAT_B8G8R8A8_UNORM,
        VK_FORMAT_B8G8R8A8_SRGB,
-#ifdef ANDROID
+#ifdef __ANDROID__
        VK_FORMAT_R8G8B8A8_UNORM,  // Android may use RGBA
        VK_FORMAT_R8G8B8A8_SRGB,
 #endif
@ -338,7 +338,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities) {

    images = swapchain.GetImages();
    image_count = static_cast<u32>(images.size());
-#ifdef ANDROID
+#ifdef __ANDROID__
    // Android is already ordered the same as Switch.
    image_view_format = VK_FORMAT_R8G8B8A8_UNORM;
 #else
--- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp
+++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp
@ -1,10 +1,10 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
 #include <adrenotools/driver.h>
 #endif

@ -20,7 +20,7 @@ namespace Vulkan {
 using namespace Common::Literals;

 TurboMode::TurboMode(const vk::Instance& instance, const vk::InstanceDispatch& dld)
-#ifndef ANDROID
+#ifndef __ANDROID__
    : m_device{CreateDevice(instance, dld, VK_NULL_HANDLE)}, m_allocator{m_device}
 #endif
 {
@ -40,7 +40,7 @@ void TurboMode::QueueSubmitted() {
 }

 void TurboMode::Run(std::stop_token stop_token) {
-#ifndef ANDROID
+#ifndef __ANDROID__
    auto& dld = m_device.GetLogical();

    // Allocate buffer. 2MiB should be sufficient.
@ -154,7 +154,7 @@ void TurboMode::Run(std::stop_token stop_token) {
 #endif

    while (!stop_token.stop_requested()) {
-#ifdef ANDROID
+#ifdef __ANDROID__
 #ifdef ARCHITECTURE_arm64
        adrenotools_set_turbo(true);
 #endif
@ -232,7 +232,7 @@ void TurboMode::Run(std::stop_token stop_token) {
                   std::chrono::milliseconds{100};
        });
    }
-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
    adrenotools_set_turbo(false);
 #endif
 }
--- a/src/video_core/renderer_vulkan/vk_turbo_mode.h
+++ b/src/video_core/renderer_vulkan/vk_turbo_mode.h
@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@ -23,7 +26,7 @@ public:
 private:
    void Run(std::stop_token stop_token);

-#ifndef ANDROID
+#ifndef __ANDROID__
    Device m_device;
    MemoryAllocator m_allocator;
 #endif
--- a/src/video_core/smaa_area_tex.h
+++ b/src/video_core/smaa_area_tex.h
@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2013 Jorge Jimenez (jorge@iryoku.com)
 // SPDX-FileCopyrightText: 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com)
 // SPDX-FileCopyrightText: 2013 Belen Masia (bmasia@unizar.es)
@ -5,8 +8,7 @@
 // SPDX-FileCopyrightText: 2013 Diego Gutierrez (diegog@unizar.es)
 // SPDX-License-Identifier: MIT

-#ifndef AREATEX_H
-#define AREATEX_H
+#pragma once

 #define AREATEX_WIDTH 160
 #define AREATEX_HEIGHT 560
@ -11219,5 +11221,3 @@ static const unsigned char areaTexBytes[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-#endif
--- a/src/video_core/smaa_search_tex.h
+++ b/src/video_core/smaa_search_tex.h
@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2013 Jorge Jimenez (jorge@iryoku.com)
 // SPDX-FileCopyrightText: 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com)
 // SPDX-FileCopyrightText: 2013 Belen Masia (bmasia@unizar.es)
@ -5,8 +8,7 @@
 // SPDX-FileCopyrightText: 2013 Diego Gutierrez (diegog@unizar.es)
 // SPDX-License-Identifier: MIT

-#ifndef SEARCHTEX_H
-#define SEARCHTEX_H
+#pragma once

 #define SEARCHTEX_WIDTH 64
 #define SEARCHTEX_HEIGHT 16
@ -84,5 +86,3 @@ static const unsigned char searchTexBytes[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-
-#endif
--- a/src/video_core/vulkan_common/vulkan_debug_callback.cpp
+++ b/src/video_core/vulkan_common/vulkan_debug_callback.cpp
@ -27,7 +27,7 @@ VkBool32 DebugUtilCallback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
                           [[maybe_unused]] void* user_data) {
    // Skip logging known false-positive validation errors
    switch (static_cast<u32>(data->messageIdNumber)) {
-#ifdef ANDROID
+#ifdef __ANDROID__
    case 0xbf9cf353u: // VUID-vkCmdBindVertexBuffers2-pBuffers-04111
    // The below are due to incorrect reporting of extendedDynamicState
    case 0x1093bebbu: // VUID-vkCmdSetCullMode-None-03384
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@ -26,7 +26,7 @@
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 #include "video_core/gpu_logging/gpu_logging.h"

-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
 #include <adrenotools/bcenabler.h>
 #include <android/api-level.h>
 #endif
@ -294,7 +294,7 @@ ankerl::unordered_dense::map<VkFormat, VkFormatProperties> GetFormatProperties(v
    return format_properties;
 }

-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
 void OverrideBcnFormats(ankerl::unordered_dense::map<VkFormat, VkFormatProperties>& format_properties) {
    // These properties are extracted from Adreno driver 512.687.0
    constexpr VkFormatFeatureFlags tiling_features{VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
@ -504,7 +504,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
        features.shader_atomic_int64.shaderSharedInt64Atomics = false;
        features.features.shaderInt64 = false;

-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
        // BCn patching only safe on Android 9+ (API 28+). Older versions crash on driver load.
        const auto major = (properties.properties.driverVersion >> 24) << 2;
        const auto minor = (properties.properties.driverVersion >> 12) & 0xFFFU;
@ -1481,6 +1481,12 @@ void Device::CollectToolingInfo() {
        has_nsight_graphics = has_nsight_graphics || name == "NVIDIA Nsight Graphics";
        has_radeon_gpu_profiler = has_radeon_gpu_profiler || name == "Radeon GPU Profiler";
    }
+#ifdef _WIN32
+    if (has_renderdoc) {
+        LOG_INFO(Render_Vulkan,
+                 "Windows default RenderDoc output folder: %LOCALAPPDATA%\\Temp\\RenderDoc");
+    }
+#endif
 }

 std::vector<VkDeviceQueueCreateInfo> Device::GetDeviceQueueCreateInfos() const {
--- a/src/video_core/vulkan_common/vulkan_library.cpp
+++ b/src/video_core/vulkan_common/vulkan_library.cpp
@ -16,7 +16,7 @@ namespace Vulkan {
 std::shared_ptr<Common::DynamicLibrary> OpenLibrary(
    [[maybe_unused]] Core::Frontend::GraphicsContext* context) {
    LOG_DEBUG(Render_Vulkan, "Looking for a Vulkan library");
-#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
    // Android manages its Vulkan driver from the frontend.
    return context->GetDriverLibrary();
 #else
--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp
+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp
@ -725,10 +725,15 @@ PipelineLayout Device::CreatePipelineLayout(const VkPipelineLayoutCreateInfo& ci
    return PipelineLayout(object, handle, *dld);
 }

-Pipeline Device::CreateGraphicsPipeline(const VkGraphicsPipelineCreateInfo& ci,
-                                        VkPipelineCache cache) const {
-    VkPipeline object;
-    Check(dld->vkCreateGraphicsPipelines(handle, cache, 1, &ci, nullptr, &object));
+Pipeline Device::CreateGraphicsPipeline(const VkGraphicsPipelineCreateInfo& ci, VkPipelineCache cache) const {
+    VkPipeline object = VK_NULL_HANDLE;
+    auto const result = dld->vkCreateGraphicsPipelines(handle, cache, 1, &ci, nullptr, &object);
+    // Adreno 5xx drivers do not properly return when a graphics pipeline fails to be created
+    // Some (unkown) Mali drivers also do not properly return
+    // This result code is out of spec, but should be handled as "kinda working"
+    if (result == VK_INCOMPLETE)
+        return Pipeline(object, handle, *dld);
+    Check(result);
    return Pipeline(object, handle, *dld);
 }

--- a/src/video_core/vulkan_common/vulkan_wrapper.h
+++ b/src/video_core/vulkan_common/vulkan_wrapper.h
@ -453,7 +453,7 @@ public:
        return handle != Type{};
    }

-#ifndef ANDROID
+#ifndef __ANDROID__
    /**
     * Releases ownership of the managed handle.
     * The caller is responsible for managing the lifetime of the returned handle.
@ -535,7 +535,7 @@ public:
        return handle != Type{};
    }

-#ifndef ANDROID
+#ifndef __ANDROID__
    /**
     * Releases ownership of the managed handle.
     * The caller is responsible for managing the lifetime of the returned handle.
--- a/src/yuzu/data_dialog.h
+++ b/src/yuzu/data_dialog.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef DATA_DIALOG_H
-#define DATA_DIALOG_H
+#pragma once

 #include <QDialog>
 #include "frontend_common/data_manager.h"
@ -47,5 +46,3 @@ private:

    std::optional<std::string> selectProfile();
 };
-
-#endif // DATA_DIALOG_H
--- a/src/yuzu/migration_dialog.h
+++ b/src/yuzu/migration_dialog.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef MIGRATION_DIALOG_H
-#define MIGRATION_DIALOG_H
+#pragma once

 #include <QHBoxLayout>
 #include <QMessageBox>
@ -29,5 +28,3 @@ private:

    QAbstractButton* m_clickedButton;
 };
-
-#endif // MIGRATION_DIALOG_H
--- a/src/yuzu/migration_worker.h
+++ b/src/yuzu/migration_worker.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef MIGRATION_WORKER_H
-#define MIGRATION_WORKER_H
+#pragma once

 #include <QObject>
 #include "common/fs/path_util.h"
@ -73,5 +72,3 @@ private:
    MigrationStrategy strategy;
    QString success_text = tr("Data was migrated successfully.");
 };
-
-#endif // MIGRATION_WORKER_H
--- a/src/yuzu/ryujinx_dialog.h
+++ b/src/yuzu/ryujinx_dialog.h
@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#ifndef RYUJINX_DIALOG_H
-#define RYUJINX_DIALOG_H
+#pragma once

 #include <filesystem>
 #include <QDialog>
@ -28,5 +27,3 @@ private:
    std::filesystem::path m_eden;
    std::filesystem::path m_ryu;
 };
-
-#endif // RYUJINX_DIALOG_H
--- a/tools/cpp-lint.sh
+++ b/tools/cpp-lint.sh
@ -0,0 +1,55 @@
+#!/bin/sh -ex
+
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# tools/../
+ROOTDIR=$(CDPATH='' cd -- "$(dirname -- "$0")/../" && pwd)
+BUILD_DIR="$ROOTDIR"/build
+SRC_DIR="$ROOTDIR"/src
+
+die() {
+    echo "-- $*" >&2
+    exit 1
+}
+
+usage() {
+    cat <<EOF
+Usage: $0 [command]
+
+Dumb script that serves as a ad-hoc cpp-linter
+
+Commands:
+    once    Check for #pragma once prescence in header files
+	osdef	Finds OS defines that are not recommended to use.
+	inchk   Check includes being valid/toolchain not being stupid
+EOF
+}
+
+while :; do
+	case "$1" in
+	once)
+        find "$SRC_DIR" -type f -name "*.h" -exec grep -L "#pragma once" {} +
+		break
+		;;
+	osdef)
+		# not recommended macros
+		PATTERN="ANDROID\|_WIN64\|__linux\|__unix\|APPLE\|__APPLE"
+		strings=("ANDROID" "_WIN64" "__linux" "__unix" "APPLE" "__APPLE" "linux" "unix")
+		for item in "${strings[@]}"; do
+			PATTERN="$PATTERN\|ifdef $item\|($item)"
+		done
+		# if statements for macros that shouldn't be if
+		strings=("_WIN32" "_AIX" "__managarm__" "__unix__" "__linux__" "__FreeBSD__" "__NetBSD__" \
+			"__OpenBSD__" "__DragonFly__" "__redox__" "__HAIKU__" "__OHOS__" "__FIREOS__")
+		for item in "${strings[@]}"; do
+			PATTERN="$PATTERN\|if $item"
+		done
+        find "$SRC_DIR" -type f -name "*.h" -exec grep -nw "$PATTERN" {} + || echo
+		break
+		;;
+	*) usage ;;
+	esac
+
+	shift
+done
Author	SHA1	Message	Date
lizzie	31f3875e19	waw	2026-06-03 05:02:57 +02:00
lizzie	0ef5983cec	fix?	2026-06-03 05:02:57 +02:00
lizzie	2a2bf05e41	use only __linux__	2026-06-03 05:02:57 +02:00
lizzie	48945f7082	ANDROID -> __ANDROID__	2026-06-03 05:02:57 +02:00
lizzie	9ae4915e9c	[*] basic in-house cpp linting Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-06-03 05:02:57 +02:00
xbzk	ec2b9b0400	[vk, renderdoc] fixed zero-sized streambuffer bug on old heap-absent GPUs (#4052 ) This fix a bug in which eden crashes when renderdoc is attached to vulkan. that kept me away from renderdoc for around a year now. the bug: in video_core\renderer_vulkan\vk_staging_buffer_pool.cpp in GetStreamBufferSize(...) if device.HasDebuggingToolAttached() but heap is empty/unavailable <-- Case in my old nvidia kepler gpu the original method returns size 0, right? the change honors same original behavior, while covers my case properly, returning MAX_STREAM_BUFFER_SIZE. addl some log tip and some minimal doc. fully safe. let it rip. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4052 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: Lizzie <lizzie@eden-emu.dev>	2026-06-03 05:02:13 +02:00
lizzie	5027aecf77	[vk] handle mali/adreno5xx driver bug returning VK_INCOMPLETE on graphics pipeline creation (#3383 ) Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3383 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-06-02 21:57:23 +02:00
crueter	f39e985434	[cmake] Link to `UniformTypeIdentifiers` framework on macOS (#4046 ) Needed for local LLVM builds Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4046 Reviewed-by: Lizzie <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-06-02 21:40:51 +02:00