From 290afc00d36bbdcdc67d66a4586fd2f188734ad3 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 14:36:20 -0400 Subject: [PATCH 1/9] common: Move error handling to error.cpp/h This allows us to avoid implicitly including every time common_funcs.h is included. --- src/common/CMakeLists.txt | 3 ++- src/common/common_funcs.h | 11 ----------- src/common/{misc.cpp => error.cpp} | 6 +++++- src/common/error.h | 21 +++++++++++++++++++++ src/common/thread.cpp | 6 +++--- src/core/network/network.cpp | 5 +++-- 6 files changed, 34 insertions(+), 18 deletions(-) rename src/common/{misc.cpp => error.cpp} (95%) create mode 100644 src/common/error.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 57922b51ce..b18a2a2f50 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -53,6 +53,8 @@ add_library(common STATIC div_ceil.h dynamic_library.cpp dynamic_library.h + error.cpp + error.h fiber.cpp fiber.h fs/file.cpp @@ -88,7 +90,6 @@ add_library(common STATIC microprofile.cpp microprofile.h microprofileui.h - misc.cpp nvidia_flags.cpp nvidia_flags.h page_table.cpp diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 53bd7da608..85f8bdd227 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -6,7 +6,6 @@ #include #include -#include #if !defined(ARCHITECTURE_x86_64) #include // for exit @@ -49,16 +48,6 @@ __declspec(dllimport) void __stdcall DebugBreak(void); #endif // _MSC_VER ndef -// Generic function to get last error message. -// Call directly after the command or use the error num. -// This function might change the error code. -// Defined in misc.cpp. -[[nodiscard]] std::string GetLastErrorMsg(); - -// Like GetLastErrorMsg(), but passing an explicit error code. -// Defined in misc.cpp. -[[nodiscard]] std::string NativeErrorToString(int e); - #define DECLARE_ENUM_FLAG_OPERATORS(type) \ [[nodiscard]] constexpr type operator|(type a, type b) noexcept { \ using T = std::underlying_type_t; \ diff --git a/src/common/misc.cpp b/src/common/error.cpp similarity index 95% rename from src/common/misc.cpp rename to src/common/error.cpp index 495385b9e3..d4455e3100 100644 --- a/src/common/misc.cpp +++ b/src/common/error.cpp @@ -10,7 +10,9 @@ #include #endif -#include "common/common_funcs.h" +#include "common/error.h" + +namespace Common { std::string NativeErrorToString(int e) { #ifdef _WIN32 @@ -50,3 +52,5 @@ std::string GetLastErrorMsg() { return NativeErrorToString(errno); #endif } + +} // namespace Common diff --git a/src/common/error.h b/src/common/error.h new file mode 100644 index 0000000000..e084d4b0f2 --- /dev/null +++ b/src/common/error.h @@ -0,0 +1,21 @@ +// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +namespace Common { + +// Generic function to get last error message. +// Call directly after the command or use the error num. +// This function might change the error code. +// Defined in error.cpp. +[[nodiscard]] std::string GetLastErrorMsg(); + +// Like GetLastErrorMsg(), but passing an explicit error code. +// Defined in error.cpp. +[[nodiscard]] std::string NativeErrorToString(int e); + +} // namespace Common diff --git a/src/common/thread.cpp b/src/common/thread.cpp index d2c1ac60de..946a1114d5 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "common/common_funcs.h" +#include + +#include "common/error.h" #include "common/logging/log.h" #include "common/thread.h" #ifdef __APPLE__ @@ -21,8 +23,6 @@ #include #endif -#include - #ifdef __FreeBSD__ #define cpu_set_t cpuset_t #endif diff --git a/src/core/network/network.cpp b/src/core/network/network.cpp index 4732d44858..72eea52f03 100644 --- a/src/core/network/network.cpp +++ b/src/core/network/network.cpp @@ -7,7 +7,8 @@ #include #include #include -#include "common/common_funcs.h" + +#include "common/error.h" #ifdef _WIN32 #include @@ -223,7 +224,7 @@ Errno GetAndLogLastError() { if (err == Errno::AGAIN) { return err; } - LOG_ERROR(Network, "Socket operation error: {}", NativeErrorToString(e)); + LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e)); return err; } From eb1e3f19bb58802497ad2d71a36964d182839471 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 14:47:01 -0400 Subject: [PATCH 2/9] common_funcs: Replace with --- src/common/common_funcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 85f8bdd227..1e74d69304 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #if !defined(ARCHITECTURE_x86_64) #include // for exit From ae028ddf22e35178f4335baa9f65648e83087699 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:09:01 -0400 Subject: [PATCH 3/9] codec: Add missing include --- src/video_core/command_classes/codecs/codec.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index 1508d36c2b..f9a80886fc 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include "common/common_types.h" #include "video_core/command_classes/nvdec_common.h" From 4a6a73e887502b02c88de6eedf0ffa1f58de553d Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:13:21 -0400 Subject: [PATCH 4/9] file_sys/kernel_executable: Add missing include --- src/core/file_sys/kernel_executable.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/file_sys/kernel_executable.h b/src/core/file_sys/kernel_executable.h index 044c554d35..79ca82f8b8 100644 --- a/src/core/file_sys/kernel_executable.h +++ b/src/core/file_sys/kernel_executable.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include "common/common_funcs.h" From 6f307f15218e41eb243e899427412e6dd38198a7 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 20:04:29 -0400 Subject: [PATCH 5/9] kernel: Add missing include --- src/core/hle/kernel/kernel.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 3a6db0b1ce..901d43da9c 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include #include From 554c46d18600ca8cd7fbd85e4e05a108760ca400 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:43:02 -0400 Subject: [PATCH 6/9] video_core/memory_manager: Add missing include --- src/video_core/memory_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index c60ed64531..dce00e8298 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include "common/alignment.h" #include "common/assert.h" #include "common/logging/log.h" From 76abf55f254627e904ceea7e1367c23257f7e63b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:25:48 -0400 Subject: [PATCH 7/9] slot_vector: Add missing include --- src/video_core/texture_cache/slot_vector.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/texture_cache/slot_vector.h b/src/video_core/texture_cache/slot_vector.h index 6180b8c0e9..74cd3c9d8d 100644 --- a/src/video_core/texture_cache/slot_vector.h +++ b/src/video_core/texture_cache/slot_vector.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include #include From 63b4c8f9f76cef3c82ac3c2fabe8a044c1d7e5eb Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:49:08 -0400 Subject: [PATCH 8/9] vk_descriptor_pool: Add missing include --- src/video_core/renderer_vulkan/vk_descriptor_pool.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp index 8e77e47960..adb557f609 100644 --- a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include From e67463df2419feb10915eb91bba2b0485154a586 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 9 Sep 2021 12:36:00 -0400 Subject: [PATCH 9/9] shader_environment: Add missing include --- src/video_core/shader_environment.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 8a4581c192..81a878bb2c 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include