Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-06-27 14:16:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
- 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>
This commit is contained in:
lizzie 2026-06-04 05:49:07 +02:00 • committed by crueter
parent 978d9d935d
commit 89199f4d27
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
53 changed files with 176 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/cpu_features.cpp
View file

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

5
src/common/error.cpp
View file

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

6
src/common/fs/file.cpp
View file

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

10
src/common/fs/fs.cpp
View file

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

10
src/common/fs/path_util.cpp
View file

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

6
src/common/logging.cpp
View file

@ -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()};

20
src/common/settings.h
View file

@ -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,

6
src/common/string_util.cpp
View file

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

6
src/common/swap.h
View file

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