[*] basic in-house cpp linting (#4039)

- add `#pragma once` to remainder files
- "correcter" defines (ANDROID), see https://groups.google.com/g/android-ndk/c/cf9_f1SLXls
- extra miscelly fixups

Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4039
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: crueter <crueter@eden-emu.dev>

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;

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__

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__

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,

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);

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);

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) {

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

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
 }

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

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

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

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

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;

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

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.