diff options
| author | JosJuice <josjuice@gmail.com> | 2021-12-12 15:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 15:14:28 +0100 |
| commit | f4e2d369c075f44f037289a1ccb78274c7d5cb39 (patch) | |
| tree | 9b89dd27ea346edb18349c7e68b3f498c178d64f /Source/Core | |
| parent | bfddce425dfb4767aefe00c9e4b49126a50d62b6 (diff) | |
| parent | 20257634209dba85d2cd51ad42e660090a5224e6 (diff) | |
Merge pull request #10270 from Pokechu22/header-order
Treewide: Adjust order of includes
Diffstat (limited to 'Source/Core')
219 files changed, 439 insertions, 259 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index c45d7bee1c..5645efa58b 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -1,9 +1,10 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "AudioCommon/AlsaSoundStream.h" + #include <mutex> -#include "AudioCommon/AlsaSoundStream.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/Thread.h" diff --git a/Source/Core/AudioCommon/AudioStretcher.cpp b/Source/Core/AudioCommon/AudioStretcher.cpp index c786dc0941..a5e54b8163 100644 --- a/Source/Core/AudioCommon/AudioStretcher.cpp +++ b/Source/Core/AudioCommon/AudioStretcher.cpp @@ -1,11 +1,12 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "AudioCommon/AudioStretcher.h" + #include <algorithm> #include <cmath> #include <cstddef> -#include "AudioCommon/AudioStretcher.h" #include "Common/Logging/Log.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp index 6d903bb999..b8ccbbdaee 100644 --- a/Source/Core/AudioCommon/CubebStream.cpp +++ b/Source/Core/AudioCommon/CubebStream.cpp @@ -1,9 +1,10 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "AudioCommon/CubebStream.h" + #include <cubeb/cubeb.h> -#include "AudioCommon/CubebStream.h" #include "AudioCommon/CubebUtils.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/AudioCommon/CubebUtils.cpp b/Source/Core/AudioCommon/CubebUtils.cpp index 512535ee7f..7b998b1db9 100644 --- a/Source/Core/AudioCommon/CubebUtils.cpp +++ b/Source/Core/AudioCommon/CubebUtils.cpp @@ -1,11 +1,12 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "AudioCommon/CubebUtils.h" + #include <cstdarg> #include <cstddef> #include <cstring> -#include "AudioCommon/CubebUtils.h" #include "Common/CommonPaths.h" #include "Common/Logging/Log.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index dbd2b1f69f..6888d9520b 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "AudioCommon/Mixer.h" -#include "AudioCommon/Enums.h" #include <algorithm> #include <cmath> #include <cstring> +#include "AudioCommon/Enums.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 45d1aa23c8..cdd44501ca 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -3,12 +3,13 @@ #ifdef _WIN32 +#include "AudioCommon/OpenALStream.h" + #include <windows.h> #include <climits> #include <cstring> #include <thread> -#include "AudioCommon/OpenALStream.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Thread.h" diff --git a/Source/Core/AudioCommon/SurroundDecoder.cpp b/Source/Core/AudioCommon/SurroundDecoder.cpp index 08a11694c7..ffc0b00a2f 100644 --- a/Source/Core/AudioCommon/SurroundDecoder.cpp +++ b/Source/Core/AudioCommon/SurroundDecoder.cpp @@ -1,11 +1,11 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "AudioCommon/SurroundDecoder.h" + #include <FreeSurround/FreeSurroundDecoder.h> #include <limits> -#include "AudioCommon/SurroundDecoder.h" - namespace AudioCommon { constexpr size_t STEREO_CHANNELS = 2; diff --git a/Source/Core/Common/Analytics.cpp b/Source/Core/Common/Analytics.cpp index 31f22b6e00..294e05cacf 100644 --- a/Source/Core/Common/Analytics.cpp +++ b/Source/Core/Common/Analytics.cpp @@ -1,12 +1,13 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Analytics.h" + #include <cmath> #include <cstdio> #include <string> #include <type_traits> -#include "Common/Analytics.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Thread.h" diff --git a/Source/Core/Common/AndroidAnalytics.cpp b/Source/Core/Common/AndroidAnalytics.cpp index c682d37f95..a25acb17f4 100644 --- a/Source/Core/Common/AndroidAnalytics.cpp +++ b/Source/Core/Common/AndroidAnalytics.cpp @@ -1,11 +1,11 @@ // Copyright 2018 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/AndroidAnalytics.h" + #include <functional> #include <string> -#include "Common/AndroidAnalytics.h" - namespace Common { std::function<void(std::string, std::string)> s_android_send_report; diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 443021ba37..27be0dfb96 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Arm64Emitter.h" + #include <algorithm> #include <array> #include <cinttypes> @@ -11,7 +13,6 @@ #include <vector> #include "Common/Align.h" -#include "Common/Arm64Emitter.h" #include "Common/Assert.h" #include "Common/BitUtils.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp index 45b6e67da7..a12deac71a 100644 --- a/Source/Core/Common/ArmCPUDetect.cpp +++ b/Source/Core/Common/ArmCPUDetect.cpp @@ -1,6 +1,8 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/CPUDetect.h" + #include <cstring> #include <fstream> #include <sstream> @@ -17,7 +19,6 @@ #include <fmt/format.h> -#include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" diff --git a/Source/Core/Common/ArmFPURoundMode.cpp b/Source/Core/Common/ArmFPURoundMode.cpp index 1f666d6f0d..109e9612e7 100644 --- a/Source/Core/Common/ArmFPURoundMode.cpp +++ b/Source/Core/Common/ArmFPURoundMode.cpp @@ -1,15 +1,16 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/CPUDetect.h" -#include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" -#include "Common/Logging/Log.h" #ifdef _MSC_VER #include <intrin.h> #endif +#include "Common/CPUDetect.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" + static u64 GetFPCR() { #ifdef _MSC_VER diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp index 6785969c2a..630f5d943d 100644 --- a/Source/Core/Common/CDUtils.cpp +++ b/Source/Core/Common/CDUtils.cpp @@ -3,6 +3,8 @@ // Most of the code in this file was shamelessly ripped from libcdio With minor adjustments +#include "Common/CDUtils.h" + #include <algorithm> #include <cstdlib> #include <string> @@ -10,11 +12,6 @@ #include <fmt/format.h> -#include "Common/CDUtils.h" -#include "Common/Common.h" -#include "Common/CommonTypes.h" -#include "Common/StringUtil.h" - #ifdef _WIN32 #include <windows.h> #elif __APPLE__ @@ -36,6 +33,10 @@ #include <linux/cdrom.h> #endif +#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/StringUtil.h" + namespace Common { #ifdef _WIN32 diff --git a/Source/Core/Common/CRC32.cpp b/Source/Core/Common/CRC32.cpp index 843b0c3333..c09a578196 100644 --- a/Source/Core/Common/CRC32.cpp +++ b/Source/Core/Common/CRC32.cpp @@ -1,10 +1,10 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <zlib.h> - #include "Common/CRC32.h" +#include <zlib.h> + namespace Common { u32 ComputeCRC32(std::string_view data) diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp index 9db88d5756..68834209b3 100644 --- a/Source/Core/Common/CommonFuncs.cpp +++ b/Source/Core/Common/CommonFuncs.cpp @@ -1,13 +1,13 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/CommonFuncs.h" + #include <cstddef> #include <cstring> #include <errno.h> #include <type_traits> -#include "Common/CommonFuncs.h" - #ifdef _WIN32 #include <windows.h> #define strerror_r(err, buf, len) strerror_s(buf, len, err) diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index ad42ab0570..5943f3d067 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Config/Config.h" + #include <algorithm> #include <atomic> #include <list> @@ -8,8 +10,6 @@ #include <mutex> #include <shared_mutex> -#include "Common/Config/Config.h" - namespace Config { using Layers = std::map<LayerType, std::shared_ptr<Layer>>; diff --git a/Source/Core/Common/Config/ConfigInfo.cpp b/Source/Core/Common/Config/ConfigInfo.cpp index 8fd736cc7e..e0546bf8f7 100644 --- a/Source/Core/Common/Config/ConfigInfo.cpp +++ b/Source/Core/Common/Config/ConfigInfo.cpp @@ -1,10 +1,11 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Config/ConfigInfo.h" + #include <cstring> #include "Common/CommonFuncs.h" -#include "Common/Config/ConfigInfo.h" namespace Config { diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp index ace30741b7..5520e02d2e 100644 --- a/Source/Core/Common/Config/Layer.cpp +++ b/Source/Core/Common/Config/Layer.cpp @@ -1,12 +1,13 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Config/Layer.h" + #include <algorithm> #include <cstring> #include <map> #include "Common/Config/Config.h" -#include "Common/Config/Layer.h" namespace Config { diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp index 7d7ab9c6ec..5412969c7a 100644 --- a/Source/Core/Common/Crypto/AES.cpp +++ b/Source/Core/Common/Crypto/AES.cpp @@ -1,10 +1,10 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <mbedtls/aes.h> - #include "Common/Crypto/AES.h" +#include <mbedtls/aes.h> + namespace Common::AES { std::vector<u8> DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size, Mode mode) diff --git a/Source/Core/Common/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp index fa38b4618d..3dc8c75280 100644 --- a/Source/Core/Common/Crypto/bn.cpp +++ b/Source/Core/Common/Crypto/bn.cpp @@ -1,11 +1,12 @@ // Copyright 2007,2008 Segher Boessenkool <segher@kernel.crashing.org> // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Crypto/bn.h" + #include <cstdio> #include <cstring> #include "Common/CommonTypes.h" -#include "Common/Crypto/bn.h" static void bn_zero(u8* d, int n) { diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index 6f2aa0b977..4cce6ce5dc 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -2,11 +2,12 @@ // Copyright 2007,2008 Segher Boessenkool <segher@kernel.crashing.org> // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Crypto/ec.h" + #include <algorithm> #include <cstring> #include "Common/Crypto/bn.h" -#include "Common/Crypto/ec.h" #include "Common/Inline.h" #include "Common/Random.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp index cd9518e83a..646e7f5439 100644 --- a/Source/Core/Common/ENetUtil.cpp +++ b/Source/Core/Common/ENetUtil.cpp @@ -1,7 +1,7 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "ENetUtil.h" +#include "Common/ENetUtil.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 490835bd3b..0da6c4fc13 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -1,12 +1,13 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/FileSearch.h" + #include <algorithm> #include <functional> #include <iterator> #include "Common/CommonPaths.h" -#include "Common/FileSearch.h" #include "Common/StringUtil.h" #ifdef _MSC_VER diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 07d0d55c55..0eac268b00 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/FileUtil.h" + #include <algorithm> #include <chrono> #include <cstddef> @@ -22,7 +24,6 @@ #ifdef __APPLE__ #include "Common/DynamicLibrary.h" #endif -#include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp index e7c41f1ed3..d43e898ca5 100644 --- a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp @@ -1,11 +1,12 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/GL/GLExtensions/GLExtensions.h" + #include <sstream> #include <unordered_map> #include "Common/GL/GLContext.h" -#include "Common/GL/GLExtensions/GLExtensions.h" #include "Common/Logging/Log.h" #if defined(__linux__) || defined(__APPLE__) diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp index 090a6cf101..30230e7d08 100644 --- a/Source/Core/Common/GL/GLInterface/EGL.cpp +++ b/Source/Core/Common/GL/GLInterface/EGL.cpp @@ -1,12 +1,13 @@ // Copyright 2012 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/GL/GLInterface/EGL.h" + #include <array> #include <cstdlib> #include <sstream> #include <vector> -#include "Common/GL/GLInterface/EGL.h" #include "Common/Logging/Log.h" #ifndef EGL_KHR_create_context diff --git a/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp b/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp index abe8bc3bc6..873387f7e9 100644 --- a/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp +++ b/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Common/GL/GLInterface/EGLAndroid.h" + #include <android/native_window.h> EGLDisplay GLContextEGLAndroid::OpenEGLDisplay() diff --git a/Source/Core/Common/GL/GLInterface/GLX.cpp b/Source/Core/Common/GL/GLInterface/GLX.cpp index 51544249f9..930994a992 100644 --- a/Source/Core/Common/GL/GLInterface/GLX.cpp +++ b/Source/Core/Common/GL/GLInterface/GLX.cpp @@ -1,10 +1,11 @@ // Copyright 2012 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/GL/GLInterface/GLX.h" + #include <array> #include <sstream> -#include "Common/GL/GLInterface/GLX.h" #include "Common/Logging/Log.h" #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp index d0d343be01..286859daf6 100644 --- a/Source/Core/Common/GL/GLInterface/WGL.cpp +++ b/Source/Core/Common/GL/GLInterface/WGL.cpp @@ -1,11 +1,12 @@ // Copyright 2012 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/GL/GLInterface/WGL.h" + #include <windows.h> #include <array> #include <string> -#include "Common/GL/GLInterface/WGL.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp index 216487c9f7..9f65e7158b 100644 --- a/Source/Core/Common/GL/GLUtil.cpp +++ b/Source/Core/Common/GL/GLUtil.cpp @@ -1,11 +1,12 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/GL/GLUtil.h" + #include <memory> #include "Common/Assert.h" #include "Common/GL/GLContext.h" -#include "Common/GL/GLUtil.h" #include "Common/Logging/Log.h" namespace GLUtil diff --git a/Source/Core/Common/GenericFPURoundMode.cpp b/Source/Core/Common/GenericFPURoundMode.cpp index b5075a94e3..803a327c4b 100644 --- a/Source/Core/Common/GenericFPURoundMode.cpp +++ b/Source/Core/Common/GenericFPURoundMode.cpp @@ -1,9 +1,10 @@ // Copyright 2003 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" +#include "Common/CommonTypes.h" + // Generic, do nothing namespace FPURoundMode { diff --git a/Source/Core/Common/IOFile.cpp b/Source/Core/Common/IOFile.cpp index 5ecec71d11..1378906357 100644 --- a/Source/Core/Common/IOFile.cpp +++ b/Source/Core/Common/IOFile.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/IOFile.h" + #include <cstddef> #include <cstdio> #include <string> @@ -22,7 +24,6 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" -#include "Common/IOFile.h" namespace File { diff --git a/Source/Core/Common/LdrWatcher.cpp b/Source/Core/Common/LdrWatcher.cpp index 35b2a33377..4e3fb88ba5 100644 --- a/Source/Core/Common/LdrWatcher.cpp +++ b/Source/Core/Common/LdrWatcher.cpp @@ -1,13 +1,13 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/LdrWatcher.h" + #include <Windows.h> #include <TlHelp32.h> #include <string> #include <winternl.h> -#include "Common/LdrWatcher.h" - typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA { ULONG Flags; // Reserved. diff --git a/Source/Core/Common/Logging/ConsoleListenerDroid.cpp b/Source/Core/Common/Logging/ConsoleListenerDroid.cpp index f6832ce187..ac64f0cbfc 100644 --- a/Source/Core/Common/Logging/ConsoleListenerDroid.cpp +++ b/Source/Core/Common/Logging/ConsoleListenerDroid.cpp @@ -1,10 +1,10 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <android/log.h> - #include "Common/Logging/ConsoleListener.h" +#include <android/log.h> + ConsoleListener::ConsoleListener() { } diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp index 7908bddb89..99f4018eea 100644 --- a/Source/Core/Common/Logging/ConsoleListenerNix.cpp +++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Logging/ConsoleListener.h" + #include <cstdio> #include <cstring> @@ -8,7 +10,6 @@ #include <unistd.h> #endif -#include "Common/Logging/ConsoleListener.h" #include "Common/Logging/Log.h" ConsoleListener::ConsoleListener() diff --git a/Source/Core/Common/Logging/ConsoleListenerWin.cpp b/Source/Core/Common/Logging/ConsoleListenerWin.cpp index 741c2e3eb8..7b4f08fee7 100644 --- a/Source/Core/Common/Logging/ConsoleListenerWin.cpp +++ b/Source/Core/Common/Logging/ConsoleListenerWin.cpp @@ -1,9 +1,10 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Logging/ConsoleListener.h" + #include <windows.h> -#include "Common/Logging/ConsoleListener.h" #include "Common/StringUtil.h" ConsoleListener::ConsoleListener() diff --git a/Source/Core/Common/Matrix.cpp b/Source/Core/Common/Matrix.cpp index 8e4d504398..724d28f17f 100644 --- a/Source/Core/Common/Matrix.cpp +++ b/Source/Core/Common/Matrix.cpp @@ -3,11 +3,11 @@ #include "Common/Matrix.h" -#include "Common/MathUtil.h" - #include <algorithm> #include <cmath> +#include "Common/MathUtil.h" + namespace { // Multiply a NxM matrix by a MxP matrix. diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 79f697b7d2..7d5d7ab165 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/MemArena.h" + #include <cstddef> #include <cstdlib> #include <set> @@ -9,7 +11,6 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/MemArena.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 2088916772..858135bc0e 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/MemoryUtil.h" + #include <cstddef> #include <cstdlib> #include <string> @@ -8,7 +10,6 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/MemoryUtil.h" #include "Common/MsgHandler.h" #ifdef _WIN32 diff --git a/Source/Core/Common/PcapFile.cpp b/Source/Core/Common/PcapFile.cpp index 56b3ecee82..71fcdc9eee 100644 --- a/Source/Core/Common/PcapFile.cpp +++ b/Source/Core/Common/PcapFile.cpp @@ -1,11 +1,12 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/PcapFile.h" + #include <chrono> #include "Common/CommonTypes.h" #include "Common/IOFile.h" -#include "Common/PcapFile.h" namespace Common { diff --git a/Source/Core/Common/PerformanceCounter.cpp b/Source/Core/Common/PerformanceCounter.cpp index 5df0c0d421..efe78e33db 100644 --- a/Source/Core/Common/PerformanceCounter.cpp +++ b/Source/Core/Common/PerformanceCounter.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #if !defined(_WIN32) +#include "Common/PerformanceCounter.h" #include <cstdint> #include <ctime> @@ -9,7 +10,6 @@ #include <unistd.h> #include "Common/CommonTypes.h" -#include "Common/PerformanceCounter.h" #if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 #if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0 diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp index 1b1053b473..6e35318668 100644 --- a/Source/Core/Common/Profiler.cpp +++ b/Source/Core/Common/Profiler.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/Profiler.h" + #include <algorithm> #include <cmath> #include <cstdio> @@ -9,7 +11,6 @@ #include <ios> #include <sstream> -#include "Common/Profiler.h" #include "Common/Timer.h" namespace Common diff --git a/Source/Core/Common/QoSSession.cpp b/Source/Core/Common/QoSSession.cpp index b7c02585d8..f143517427 100644 --- a/Source/Core/Common/QoSSession.cpp +++ b/Source/Core/Common/QoSSession.cpp @@ -2,13 +2,14 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Common/QoSSession.h" -#include "Core/ConfigManager.h" #if defined(_WIN32) #include <Qos2.h> #pragma comment(lib, "qwave") #endif +#include "Core/ConfigManager.h" + namespace Common { #if defined(_WIN32) diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index 361444d49a..f9d352b415 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -1,6 +1,8 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/SymbolDB.h" + #include <cstring> #include <map> #include <string> @@ -8,7 +10,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/SymbolDB.h" namespace Common { diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index a0967e533c..7bbc27e5f4 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -2,9 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Common/Thread.h" -#include "Common/CommonFuncs.h" -#include "Common/CommonTypes.h" -#include "Common/StringUtil.h" #ifdef _WIN32 #include <Windows.h> @@ -28,6 +25,10 @@ #pragma comment(lib, "libittnotify.lib") #endif +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" +#include "Common/StringUtil.h" + namespace Common { int CurrentThreadId() diff --git a/Source/Core/Common/x64ABI.cpp b/Source/Core/Common/x64ABI.cpp index afa34f889c..0c4f0770ca 100644 --- a/Source/Core/Common/x64ABI.cpp +++ b/Source/Core/Common/x64ABI.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Common/x64ABI.h" + #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 87c3d50acd..2cac9fb640 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -1,10 +1,11 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/CPUDetect.h" + #include <cstring> #include <string> -#include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/Intrinsics.h" diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 693d903819..2c95a61de8 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -1,13 +1,14 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/x64Emitter.h" + #include <cinttypes> #include <cstring> #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/x64Emitter.h" #include "Common/x64Reg.h" namespace Gen diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index f69422302f..553c96b2d6 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -1,11 +1,12 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Common/FPURoundMode.h" + #include <cfenv> #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" -#include "Common/FPURoundMode.h" #include "Common/Intrinsics.h" namespace FPURoundMode diff --git a/Source/Core/Core/CheatGeneration.cpp b/Source/Core/Core/CheatGeneration.cpp index 8011a879ad..e6120a0e58 100644 --- a/Source/Core/Core/CheatGeneration.cpp +++ b/Source/Core/Core/CheatGeneration.cpp @@ -1,12 +1,12 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/CheatGeneration.h" + #include <vector> #include <fmt/format.h> -#include "Core/CheatGeneration.h" - #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/Result.h" diff --git a/Source/Core/Core/Config/FreeLookSettings.cpp b/Source/Core/Core/Config/FreeLookSettings.cpp index ee8d27c2f7..7ac600cc09 100644 --- a/Source/Core/Core/Config/FreeLookSettings.cpp +++ b/Source/Core/Core/Config/FreeLookSettings.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Core/Config/FreeLookSettings.h" -#include "Core/FreeLookConfig.h" #include <string> #include "Common/Config/Config.h" +#include "Core/FreeLookConfig.h" namespace Config { diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp index afa2bbcba4..bdfcb65943 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/DSP/DSPAccelerator.cpp @@ -1,10 +1,10 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <algorithm> - #include "Core/DSP/DSPAccelerator.h" +#include <algorithm> + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index 91058f01b5..7853ae0806 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -2,6 +2,8 @@ // Copyright 2004 Duddie & Tratax // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/DSPCore.h" + #include <atomic> #include <cstddef> #include <cstring> @@ -14,7 +16,6 @@ #include "Common/Swap.h" #include "Core/DSP/DSPAccelerator.h" -#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHost.h" #include "Core/DSP/DSPTables.h" diff --git a/Source/Core/Core/DSP/DSPMemoryMap.cpp b/Source/Core/Core/DSP/DSPMemoryMap.cpp index 1e0ea30a5f..1554e52ae9 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/DSP/DSPMemoryMap.cpp @@ -2,9 +2,10 @@ // Copyright 2004 Duddie & Tratax // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/DSPCore.h" + #include "Common/Logging/Log.h" -#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPTables.h" namespace DSP diff --git a/Source/Core/Core/DSP/DSPStacks.cpp b/Source/Core/Core/DSP/DSPStacks.cpp index 9a3bf9f87b..60207585cc 100644 --- a/Source/Core/Core/DSP/DSPStacks.cpp +++ b/Source/Core/Core/DSP/DSPStacks.cpp @@ -2,10 +2,11 @@ // Copyright 2004 Duddie & Tratax // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/DSPCore.h" + #include <cstddef> #include "Common/CommonTypes.h" -#include "Core/DSP/DSPCore.h" // Stacks. The stacks are outside the DSP RAM, in dedicated hardware. namespace DSP diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp index c4319db554..9a6e1335ef 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp @@ -3,9 +3,10 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Core/DSP/Interpreter/DSPInterpreter.h" + #include "Core/DSP/Interpreter/DSPIntCCUtil.h" #include "Core/DSP/Interpreter/DSPIntUtil.h" -#include "Core/DSP/Interpreter/DSPInterpreter.h" // Arithmetic and accumulator control. diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp index 5f67d953c9..8b2aca8c8b 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp @@ -3,9 +3,10 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPCore.h" #include "Core/DSP/Interpreter/DSPInterpreter.h" +#include "Core/DSP/DSPCore.h" + namespace DSP::Interpreter { // Generic call implementation diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp index df6fb4c322..17973a9a1e 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp @@ -3,9 +3,10 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Common/CommonTypes.h" #include "Core/DSP/Interpreter/DSPInterpreter.h" +#include "Common/CommonTypes.h" + namespace DSP::Interpreter { // SRSH @M, $acS.h diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp index 4335bb2f69..7b1971adf4 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp @@ -3,10 +3,11 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Core/DSP/Interpreter/DSPInterpreter.h" + #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPTables.h" #include "Core/DSP/Interpreter/DSPIntUtil.h" -#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSP::Interpreter { diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp index 0816e8deed..9f9450514e 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp @@ -5,10 +5,11 @@ // Multiplier and product register control +#include "Core/DSP/Interpreter/DSPInterpreter.h" + #include "Core/DSP/DSPTables.h" #include "Core/DSP/Interpreter/DSPIntCCUtil.h" #include "Core/DSP/Interpreter/DSPIntUtil.h" -#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSP::Interpreter { diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp index 1a9270cab1..864c488d81 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp @@ -3,10 +3,10 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Common/CommonTypes.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp index 81ee4f6d8d..12e70e4663 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp @@ -1,12 +1,13 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/Jit/x64/DSPEmitter.h" + #include "Common/CommonTypes.h" #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPTables.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp index a891d0c483..30cd5d8497 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp @@ -3,9 +3,10 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPCore.h" #include "Core/DSP/Jit/x64/DSPEmitter.h" +#include "Core/DSP/DSPCore.h" + using namespace Gen; namespace DSP::JIT::x64 diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp index 96147237c0..d84b626b6e 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp @@ -1,10 +1,11 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/Jit/x64/DSPEmitter.h" + #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp index 282bc16c3b..29ed5f0e80 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp @@ -3,10 +3,11 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Core/DSP/Jit/x64/DSPEmitter.h" + #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp index 0e0dd087b4..a5e3d207f0 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp @@ -1,10 +1,11 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/DSP/Jit/x64/DSPEmitter.h" + #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp index 7fba07f974..d37e7fd460 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp @@ -5,12 +5,13 @@ // Multiplier and product register control +#include "Core/DSP/Jit/x64/DSPEmitter.h" + #include <cstddef> #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp index bbf97b98c7..67c66e06c3 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp @@ -1,11 +1,11 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/CommonTypes.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" +#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DolphinAnalytics.cpp b/Source/Core/Core/DolphinAnalytics.cpp index 2c54129ecc..a15715c58f 100644 --- a/Source/Core/Core/DolphinAnalytics.cpp +++ b/Source/Core/Core/DolphinAnalytics.cpp @@ -1,3 +1,6 @@ +// Copyright 2016 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + #include "Core/DolphinAnalytics.h" #include <array> diff --git a/Source/Core/Core/HW/EXI/BBA/TAPServer_Apple.cpp b/Source/Core/Core/HW/EXI/BBA/TAPServer_Apple.cpp index 516b79ab4c..ad87b5ee84 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAPServer_Apple.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAPServer_Apple.cpp @@ -1,6 +1,8 @@ // Copyright 2020 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/EXI/EXI_DeviceEthernet.h" + #include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> @@ -9,7 +11,6 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/HW/EXI/EXI_Device.h" -#include "Core/HW/EXI/EXI_DeviceEthernet.h" namespace ExpansionInterface { diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Apple.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Apple.cpp index 2dbff03ceb..b6aa647954 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAP_Apple.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAP_Apple.cpp @@ -1,13 +1,14 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/EXI/EXI_DeviceEthernet.h" + #include <fcntl.h> #include <unistd.h> #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/HW/EXI/EXI_Device.h" -#include "Core/HW/EXI/EXI_DeviceEthernet.h" namespace ExpansionInterface { diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp index a0673e9c09..4904b2a90b 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/EXI/EXI_DeviceEthernet.h" + #include <cstring> #ifndef _WIN32 @@ -10,7 +12,6 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/HW/EXI/EXI_Device.h" -#include "Core/HW/EXI/EXI_DeviceEthernet.h" #ifdef __linux__ #include <fcntl.h> diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp index 38d7f8f13c..57e2418b87 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp @@ -2,12 +2,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Core/HW/EXI/BBA/TAP_Win32.h" +#include "Core/HW/EXI/EXI_DeviceEthernet.h" + #include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/HW/EXI/EXI_Device.h" -#include "Core/HW/EXI/EXI_DeviceEthernet.h" namespace Win32TAPHelper { diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index f589b35bba..1d6b17bdf4 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Core/HW/EXI/EXI_DeviceIPL.h" -#include "Core/HW/DVD/DVDInterface.h" #include <cstring> #include <string> diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp index 437167924d..c7cc7942f8 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp @@ -1,3 +1,6 @@ +// Copyright 2020 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + #include "Core/HW/GCMemcard/GCMemcardUtils.h" #include <array> diff --git a/Source/Core/Core/HW/SI/SI_DeviceGBAEmu.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBAEmu.cpp index 1d672a457c..744defea9f 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGBAEmu.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGBAEmu.cpp @@ -1,6 +1,8 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/SI/SI_DeviceGBAEmu.h" + #include <vector> #include "Common/ChunkFile.h" @@ -12,7 +14,6 @@ #include "Core/HW/GBACore.h" #include "Core/HW/GBAPad.h" #include "Core/HW/SI/SI.h" -#include "Core/HW/SI/SI_DeviceGBAEmu.h" #include "Core/HW/SI/SI_DeviceGCController.h" #include "Core/HW/SystemTimers.h" #include "Core/Host.h" diff --git a/Source/Core/Core/HW/SI/SI_DeviceNull.cpp b/Source/Core/Core/HW/SI/SI_DeviceNull.cpp index 910e5d0431..72e769e2e8 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceNull.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceNull.cpp @@ -2,9 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Core/HW/SI/SI_DeviceNull.h" -#include "Common/Swap.h" - -#include <cstring> namespace SerialInterface { diff --git a/Source/Core/Core/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp index b23a1eb60e..07ede792c9 100644 --- a/Source/Core/Core/HW/StreamADPCM.cpp +++ b/Source/Core/Core/HW/StreamADPCM.cpp @@ -3,10 +3,10 @@ // Adapted from in_cube by hcs & destop -#include <algorithm> - #include "Core/HW/StreamADPCM.h" +#include <algorithm> + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index f74b7722a9..63571fe364 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" + #include <cmath> #include <fstream> #include <iterator> @@ -14,9 +16,8 @@ #include "Common/Swap.h" #include "Core/Core.h" #include "Core/DolphinAnalytics.h" +#include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteCommon/WiimoteHid.h" -#include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp index fbc319b5fb..10234ceef7 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/WiimoteReal/IOAndroid.h" + #include <jni.h> #include "Common/CommonTypes.h" @@ -11,8 +13,6 @@ #include "Common/Thread.h" #include "Common/Timer.h" -#include "Core/HW/WiimoteReal/IOAndroid.h" - #include "jni/AndroidCommon/IDCache.h" namespace WiimoteReal diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp index 7326ae7624..b8db0b67cc 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/WiimoteReal/IOLinux.h" + #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> @@ -10,7 +12,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Core/HW/WiimoteReal/IOLinux.h" namespace WiimoteReal { diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index 7f00cc57ee..6c4ae0a1f7 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/WiimoteReal/IOWin.h" + #include <algorithm> #include <cstdio> #include <cstdlib> @@ -30,7 +32,6 @@ #include "Core/HW/WiimoteCommon/DataReport.h" #include "Core/HW/WiimoteCommon/WiimoteConstants.h" #include "Core/HW/WiimoteCommon/WiimoteReport.h" -#include "Core/HW/WiimoteReal/IOWin.h" // Create func_t function pointer type and declare a nullptr-initialized static variable of that // type named "pfunc". diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp index ff0de2e5ca..ca0c2c5483 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp @@ -1,13 +1,14 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/HW/WiimoteReal/IOhidapi.h" + #include <algorithm> #include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/HW/WiimoteCommon/WiimoteHid.h" -#include "Core/HW/WiimoteReal/IOhidapi.h" using namespace WiimoteCommon; using namespace WiimoteReal; diff --git a/Source/Core/Core/IOS/DolphinDevice.cpp b/Source/Core/Core/IOS/DolphinDevice.cpp index 6f8bb1d25a..face12f66d 100644 --- a/Source/Core/Core/IOS/DolphinDevice.cpp +++ b/Source/Core/Core/IOS/DolphinDevice.cpp @@ -1,6 +1,8 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/IOS/DolphinDevice.h" + #include <algorithm> #include <cstring> @@ -16,7 +18,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/DolphinDevice.h" namespace IOS::HLE { diff --git a/Source/Core/Core/IOS/ES/NandUtils.cpp b/Source/Core/Core/IOS/ES/NandUtils.cpp index be202a0aba..3c0752f39c 100644 --- a/Source/Core/Core/IOS/ES/NandUtils.cpp +++ b/Source/Core/Core/IOS/ES/NandUtils.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/IOS/ES/ES.h" + #include <algorithm> #include <array> #include <cctype> @@ -17,7 +19,6 @@ #include "Common/NandPaths.h" #include "Common/ScopeGuard.h" #include "Common/StringUtil.h" -#include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/Formats.h" #include "Core/IOS/FS/FileSystemProxy.h" #include "Core/IOS/Uids.h" diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp index 7bdb785e7f..b586dcee8f 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp +++ b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/IOS/FS/HostBackend/FS.h" + #include <algorithm> #include <optional> #include <string_view> @@ -17,7 +19,6 @@ #include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/IOS/ES/ES.h" -#include "Core/IOS/FS/HostBackend/FS.h" #include "Core/IOS/IOS.h" namespace IOS::HLE::FS diff --git a/Source/Core/Core/IOS/FS/HostBackend/File.cpp b/Source/Core/Core/IOS/FS/HostBackend/File.cpp index bdc4518310..1e4ea5e725 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/File.cpp +++ b/Source/Core/Core/IOS/FS/HostBackend/File.cpp @@ -1,6 +1,8 @@ // Copyright 2018 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/IOS/FS/HostBackend/FS.h" + #include <algorithm> #include <memory> @@ -9,8 +11,6 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Core/IOS/FS/HostBackend/FS.h" - namespace IOS::HLE::FS { // This isn't theadsafe, but it's only called from the CPU thread. diff --git a/Source/Core/Core/LibusbUtils.cpp b/Source/Core/Core/LibusbUtils.cpp index ca0841d3f9..73ca35bba1 100644 --- a/Source/Core/Core/LibusbUtils.cpp +++ b/Source/Core/Core/LibusbUtils.cpp @@ -1,6 +1,8 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/LibusbUtils.h" + #include <mutex> #include <thread> @@ -11,7 +13,6 @@ #include "Common/Assert.h" #include "Common/Flag.h" #include "Common/Thread.h" -#include "Core/LibusbUtils.h" namespace LibusbUtils { diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp index 343f9d0248..ec30fa6d82 100644 --- a/Source/Core/Core/MemoryWatcher.cpp +++ b/Source/Core/Core/MemoryWatcher.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/MemoryWatcher.h" + #include <cstring> #include <fstream> #include <iostream> @@ -9,7 +11,6 @@ #include "Common/FileUtil.h" #include "Core/HW/SystemTimers.h" -#include "Core/MemoryWatcher.h" #include "Core/PowerPC/MMU.h" MemoryWatcher::MemoryWatcher() diff --git a/Source/Core/Core/MemoryWatcher.h b/Source/Core/Core/MemoryWatcher.h index ed721d129d..3887d68e35 100644 --- a/Source/Core/Core/MemoryWatcher.h +++ b/Source/Core/Core/MemoryWatcher.h @@ -3,7 +3,10 @@ #pragma once +#include "Common/CommonTypes.h" + #include <map> +#include <string> #include <sys/socket.h> #include <sys/un.h> #include <vector> diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index 2d5dac1efb..45896ec4ab 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -3,6 +3,8 @@ // Originally written by Sven Peter <sven@fail0verflow.com> for anergistic. +#include "Core/PowerPC/GDBStub.h" + #include <fmt/format.h> #include <optional> #include <signal.h> @@ -31,7 +33,6 @@ typedef SSIZE_T ssize_t; #include "Core/HW/Memmap.h" #include "Core/Host.h" #include "Core/PowerPC/BreakPoints.h" -#include "Core/PowerPC/GDBStub.h" #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/PPCCache.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp index 54fe1ae73e..6f51ca9013 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp @@ -1,12 +1,13 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/HLE/HLE.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/PowerPC.h" void Interpreter::bx(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 244e4d8ee7..16e86de6eb 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -1,13 +1,14 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include <cmath> #include <limits> #include "Common/CommonTypes.h" #include "Common/FloatUtils.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 9989024bb1..80103648a0 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" @@ -9,7 +11,6 @@ #include "Core/ConfigManager.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index a09bbc7770..6905c7a2ab 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include <algorithm> #include <tuple> #include <type_traits> @@ -11,7 +13,6 @@ #include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 964d17c117..ef4603d01b 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -1,11 +1,12 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include <cmath> #include "Common/CommonTypes.h" #include "Common/FloatUtils.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp index f7eefbd585..caecbd368a 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -1,10 +1,11 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include <array> #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/PPCTables.h" namespace diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index 24f1398b73..e201518a07 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -1,10 +1,11 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include <array> #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/Jit64/Jit.h" namespace { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index e2e6bfd120..ad78a06cea 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -1,12 +1,13 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" #include "Core/CoreTiming.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PPCAnalyst.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 9d2aad1b27..e3730082c8 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include <algorithm> #include <cmath> #include <limits> @@ -14,7 +16,6 @@ #include "Core/Config/SessionSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PPCAnalyst.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 81d9904c02..1435863eb5 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include <array> #include <limits> #include <vector> @@ -14,7 +16,6 @@ #include "Core/CoreTiming.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/JitCommon/DivUtils.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index c90bd56587..44cdd3c125 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -1,10 +1,11 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include "Common/BitSet.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index 023d0d834a..f0b525d323 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -1,11 +1,12 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/x64Emitter.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64Constants.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index 2806879bcb..f611fd7ee1 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/Jit64/Jit.h" + #include "Common/BitSet.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" @@ -9,7 +11,6 @@ #include "Core/CoreTiming.h" #include "Core/HW/ProcessorInterface.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp index a11d1a1c00..6551ed2d45 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Core/PowerPC/JitArm64/JitArm64Cache.h" + #include "Common/CommonTypes.h" #include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitCommon/JitBase.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp index ccaafaabbd..ad82c52553 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include <cinttypes> #include <cstddef> #include <optional> @@ -17,7 +19,6 @@ #include "Core/HW/Memmap.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/Jit_Util.h" #include "Core/PowerPC/JitArmCommon/BackPatch.h" #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp index c0682b616f..a92bc950ea 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp @@ -1,12 +1,13 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/CommonTypes.h" #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp index 5f941958a8..988550db0e 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" @@ -10,7 +12,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp index 989a732cee..cb7341658a 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/Assert.h" #include "Common/BitUtils.h" @@ -8,7 +10,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/JitCommon/DivUtils.h" #include "Core/PowerPC/PPCTables.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index d61f79af7e..61baecfdff 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/BitSet.h" #include "Common/CommonTypes.h" @@ -11,7 +13,6 @@ #include "Core/HW/DSP.h" #include "Core/HW/MMIO.h" #include "Core/HW/Memmap.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/JitArm64/Jit_Util.h" #include "Core/PowerPC/JitInterface.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp index 3e03ef35ef..9a0326e27b 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include <algorithm> #include "Common/Arm64Emitter.h" @@ -9,7 +11,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PPCTables.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp index 5a4daa58cc..13197303bd 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/BitSet.h" #include "Common/CommonTypes.h" @@ -9,7 +11,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp index 5690bbc481..02377e72fb 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" @@ -8,7 +10,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp index b311261997..3d48711d04 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include "Common/Arm64Emitter.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" @@ -9,7 +11,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index ef68cbe1b1..ccac60efb3 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -4,6 +4,7 @@ #include "Core/PowerPC/JitArm64/Jit.h" #include <array> + #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/PPCTables.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index bf650baf15..1b93a275c6 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit.h" + #include <limits> #include "Common/Arm64Emitter.h" @@ -14,7 +16,6 @@ #include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitCommon/JitAsmCommon.h" #include "Core/PowerPC/JitCommon/JitCache.h" #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp index 669597d192..fd86e349a8 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp @@ -1,13 +1,14 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "Core/PowerPC/JitArm64/Jit_Util.h" + #include "Common/Arm64Emitter.h" #include "Common/Common.h" #include "Core/HW/MMIO.h" #include "Core/PowerPC/JitArm64/Jit.h" -#include "Core/PowerPC/JitArm64/Jit_Util.h" using namespace Arm64Gen; diff --git a/Source/Core/Core/PowerPC/JitCommon/DivUtils.cpp b/Source/Core/Core/PowerPC/JitCommon/DivUtils.cpp index 0c8f557495..f1b6a1baf6 100644 --- a/Source/Core/Core/PowerPC/JitCommon/DivUtils.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/DivUtils.cpp @@ -1,10 +1,10 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <cstdlib> - #include "Core/PowerPC/JitCommon/DivUtils.h" +#include <cstdlib> + namespace JitCommon { Magic SignedDivisionConstants(s32 d) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index febc4373fd..b25e3fba90 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -1,12 +1,7 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -// Enable define below to enable oprofile integration. For this to work, -// it requires at least oprofile version 0.9.4, and changing the build -// system to link the Dolphin executable against libopagent. Since the -// dependency is a little inconvenient and this is possibly a slight -// performance hit, it's not enabled by default, but it's useful for -// locating performance issues. +#include "Core/PowerPC/JitCommon/JitCache.h" #include <algorithm> #include <array> diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index 4eeef7f8bb..4eac308a27 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/Blob.h" + #include <algorithm> #include <cstddef> #include <limits> @@ -13,7 +15,6 @@ #include "Common/IOFile.h" #include "Common/MsgHandler.h" -#include "DiscIO/Blob.h" #include "DiscIO/CISOBlob.h" #include "DiscIO/CompressedBlob.h" #include "DiscIO/DirectoryBlob.h" diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index ff0687d9ea..36c6850abc 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/CISOBlob.h" + #include <algorithm> #include <cstdio> #include <memory> @@ -8,7 +10,6 @@ #include "Common/CommonTypes.h" #include "Common/IOFile.h" -#include "DiscIO/CISOBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 70d123ccf3..8f491a41c6 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -1,10 +1,7 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#ifdef _WIN32 -#include <windows.h> -#include <io.h> -#endif +#include "DiscIO/CompressedBlob.h" #include <algorithm> #include <cstdio> @@ -16,6 +13,11 @@ #include <zlib.h> +#ifdef _WIN32 +#include <windows.h> +#include <io.h> +#endif + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" @@ -24,7 +26,6 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "DiscIO/Blob.h" -#include "DiscIO/CompressedBlob.h" #include "DiscIO/DiscScrubber.h" #include "DiscIO/MultithreadedCompressor.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index 643dad5390..3755317e3a 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/DriveBlob.h" + #include <algorithm> #include <cstdio> #include <cstring> @@ -12,7 +14,6 @@ #include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "DiscIO/Blob.h" -#include "DiscIO/DriveBlob.h" #ifdef _WIN32 #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index 35ab81d2ff..0594e3161a 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/Enums.h" + #include <map> #include <string> @@ -9,7 +11,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "DiscIO/Enums.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp index 5392ed3625..17c855fbfe 100644 --- a/Source/Core/DiscIO/FileBlob.cpp +++ b/Source/Core/DiscIO/FileBlob.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/FileBlob.h" + #include <algorithm> #include <memory> #include <string> @@ -10,7 +12,6 @@ #include "Common/Assert.h" #include "Common/FileUtil.h" #include "Common/MsgHandler.h" -#include "DiscIO/FileBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 44ef7b0210..ed4c11d9a8 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/FileSystemGCWii.h" + #include <algorithm> #include <cstddef> #include <cstring> @@ -19,7 +21,6 @@ #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "DiscIO/DiscUtils.h" -#include "DiscIO/FileSystemGCWii.h" #include "DiscIO/Filesystem.h" #include "DiscIO/VolumeDisc.h" diff --git a/Source/Core/DiscIO/GameModDescriptor.cpp b/Source/Core/DiscIO/GameModDescriptor.cpp index 4a1c479fca..587faafdaf 100644 --- a/Source/Core/DiscIO/GameModDescriptor.cpp +++ b/Source/Core/DiscIO/GameModDescriptor.cpp @@ -1,13 +1,13 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/GameModDescriptor.h" + #include <optional> #include <string> #include <string_view> #include <vector> -#include "DiscIO/GameModDescriptor.h" - #include <picojson.h> #include "Common/IOFile.h" diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 1d8e37052a..df12eab293 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -1,6 +1,8 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DiscIO/VolumeWad.h" + #include <algorithm> #include <cstddef> #include <cstring> @@ -24,7 +26,6 @@ #include "DiscIO/Blob.h" #include "DiscIO/Enums.h" #include "DiscIO/Volume.h" -#include "DiscIO/VolumeWad.h" #include "DiscIO/WiiSaveBanner.h" namespace DiscIO diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index 047682d31d..b5ee68a07c 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/AboutDialog.h" + #include <QLabel> #include <QTextEdit> #include <QVBoxLayout> @@ -8,7 +10,6 @@ #include "Common/Version.h" -#include "DolphinQt/AboutDialog.h" #include "DolphinQt/Resources.h" AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) diff --git a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp index d72175faf4..e394b1e4ae 100644 --- a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp +++ b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Dolphin Emulator Project5~5~5~ +// Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.h" diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index f25dc8b21b..8baa89db01 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Dolphin Emulator Project5~5~5~ +// Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/Config/Graphics/GeneralWidget.h" diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp index 1584f1a719..ceb459c57a 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp @@ -2,17 +2,16 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/Config/Graphics/GraphicsBool.h" -#include "DolphinQt/Config/Graphics/BalloonTip.h" +#include <QEvent> +#include <QFont> #include <QSignalBlocker> #include "Common/Config/Config.h" +#include "DolphinQt/Config/Graphics/BalloonTip.h" #include "DolphinQt/Settings.h" -#include <QEvent> -#include <QFont> - GraphicsBool::GraphicsBool(const QString& label, const Config::Info<bool>& setting, bool reverse) : ToolTipCheckBox(label), m_setting(setting), m_reverse(reverse) { diff --git a/Source/Core/DolphinQt/Config/InfoWidget.cpp b/Source/Core/DolphinQt/Config/InfoWidget.cpp index b7574dd913..31c7da0819 100644 --- a/Source/Core/DolphinQt/Config/InfoWidget.cpp +++ b/Source/Core/DolphinQt/Config/InfoWidget.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Config/InfoWidget.h" + #include <QComboBox> #include <QCryptographicHash> #include <QDir> @@ -17,7 +19,6 @@ #include "DiscIO/Enums.h" #include "DiscIO/Volume.h" -#include "DolphinQt/Config/InfoWidget.h" #include "DolphinQt/QtUtils/DolphinFileDialog.h" #include "DolphinQt/QtUtils/ImageConverter.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp index 8f6d922144..583025b4e5 100644 --- a/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp @@ -1,13 +1,13 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h" + #include <QFormLayout> #include <QGroupBox> #include <QHBoxLayout> #include <QVBoxLayout> -#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h" - #include "InputCommon/InputConfig.h" #include "Core/HW/GCKeyboard.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp index ca07ba8654..de2af7f9e8 100644 --- a/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp @@ -1,13 +1,13 @@ // Copyright 2018 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Config/Mapping/GCMicrophone.h" + #include <QFormLayout> #include <QGroupBox> #include <QHBoxLayout> #include <QVBoxLayout> -#include "DolphinQt/Config/Mapping/GCMicrophone.h" - #include "InputCommon/InputConfig.h" #include "Core/HW/GCPad.h" diff --git a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp index 47728d0cb8..a7589a4fc1 100644 --- a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp +++ b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Config/PropertiesDialog.h" + #include <memory> #include <QDialogButtonBox> @@ -17,7 +19,6 @@ #include "DolphinQt/Config/GeckoCodeWidget.h" #include "DolphinQt/Config/InfoWidget.h" #include "DolphinQt/Config/PatchesWidget.h" -#include "DolphinQt/Config/PropertiesDialog.h" #include "DolphinQt/Config/VerifyWidget.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h" diff --git a/Source/Core/DolphinQt/Config/SettingsWindow.cpp b/Source/Core/DolphinQt/Config/SettingsWindow.cpp index 7faf712a55..1883e8562e 100644 --- a/Source/Core/DolphinQt/Config/SettingsWindow.cpp +++ b/Source/Core/DolphinQt/Config/SettingsWindow.cpp @@ -1,12 +1,13 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Config/SettingsWindow.h" + #include <QDialogButtonBox> #include <QPushButton> #include <QTabWidget> #include <QVBoxLayout> -#include "DolphinQt/Config/SettingsWindow.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h" #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" diff --git a/Source/Core/DolphinQt/GameList/ListProxyModel.cpp b/Source/Core/DolphinQt/GameList/ListProxyModel.cpp index e01caa4d3a..968152234a 100644 --- a/Source/Core/DolphinQt/GameList/ListProxyModel.cpp +++ b/Source/Core/DolphinQt/GameList/ListProxyModel.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/GameList/ListProxyModel.h" + #include "DolphinQt/GameList/GameListModel.h" ListProxyModel::ListProxyModel(QObject* parent) : QSortFilterProxyModel(parent) diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index ca32c71dcd..b0bb587e7e 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/MainWindow.h" + #include <QApplication> #include <QCloseEvent> #include <QDateTime> @@ -86,7 +88,6 @@ #include "DolphinQt/GameList/GameList.h" #include "DolphinQt/Host.h" #include "DolphinQt/HotkeyScheduler.h" -#include "DolphinQt/MainWindow.h" #include "DolphinQt/MenuBar.h" #include "DolphinQt/NKitWarningDialog.h" #include "DolphinQt/NetPlay/NetPlayBrowser.h" diff --git a/Source/Core/DolphinQt/QtUtils/DolphinFileDialog.cpp b/Source/Core/DolphinQt/QtUtils/DolphinFileDialog.cpp index 2c2976b55f..b2d8ca2161 100644 --- a/Source/Core/DolphinQt/QtUtils/DolphinFileDialog.cpp +++ b/Source/Core/DolphinQt/QtUtils/DolphinFileDialog.cpp @@ -1,7 +1,7 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "DolphinFileDialog.h" +#include "DolphinQt/QtUtils/DolphinFileDialog.h" #include <QFileDialog> #include <QObject> diff --git a/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp b/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp index 1cf540f649..1f2ac9a566 100644 --- a/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp +++ b/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp @@ -1,10 +1,10 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <QEvent> - #include "DolphinQt/QtUtils/DoubleClickEventFilter.h" +#include <QEvent> + bool DoubleClickEventFilter::eventFilter(QObject* object, QEvent* event) { if (event->type() == QEvent::MouseButtonDblClick) diff --git a/Source/Core/DolphinQt/QtUtils/FileOpenEventFilter.cpp b/Source/Core/DolphinQt/QtUtils/FileOpenEventFilter.cpp index 00e9e884ee..a0aaacd3ee 100644 --- a/Source/Core/DolphinQt/QtUtils/FileOpenEventFilter.cpp +++ b/Source/Core/DolphinQt/QtUtils/FileOpenEventFilter.cpp @@ -1,10 +1,10 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <QFileOpenEvent> - #include "DolphinQt/QtUtils/FileOpenEventFilter.h" +#include <QFileOpenEvent> + FileOpenEventFilter::FileOpenEventFilter(QObject* event_source) : QObject(event_source) { event_source->installEventFilter(this); diff --git a/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h b/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h index d6f3f2cc90..a784685d9a 100644 --- a/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h +++ b/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h @@ -1,3 +1,6 @@ +// Copyright 2020 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #include <utility> diff --git a/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp b/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp index 7d89d8ab5d..52a8a54764 100644 --- a/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp +++ b/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp @@ -1,11 +1,11 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/QtUtils/WindowActivationEventFilter.h" + #include <QEvent> #include <QObject> -#include "DolphinQt/QtUtils/WindowActivationEventFilter.h" - bool WindowActivationEventFilter::eventFilter(QObject* object, QEvent* event) { if (event->type() == QEvent::WindowDeactivate) diff --git a/Source/Core/DolphinQt/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp index 2ab51fb536..752fdb4a7d 100644 --- a/Source/Core/DolphinQt/Resources.cpp +++ b/Source/Core/DolphinQt/Resources.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Resources.h" + #include <QGuiApplication> #include <QIcon> #include <QPixmap> @@ -10,7 +12,6 @@ #include "Core/ConfigManager.h" -#include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" #ifdef _WIN32 diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp index 734854efb8..41fe993f36 100644 --- a/Source/Core/DolphinQt/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt/Settings/PathPane.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/Settings/PathPane.h" + #include <QCheckBox> #include <QDir> #include <QGroupBox> @@ -18,7 +20,6 @@ #include "DolphinQt/QtUtils/DolphinFileDialog.h" #include "DolphinQt/Settings.h" -#include "DolphinQt/Settings/PathPane.h" PathPane::PathPane(QWidget* parent) : QWidget(parent) { diff --git a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp index df84495b75..cad896bab0 100644 --- a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp @@ -1,6 +1,8 @@ // Copyright 2018 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/TAS/WiiTASInputWindow.h" + #include <cmath> #include <QCheckBox> @@ -31,7 +33,6 @@ #include "DolphinQt/QtUtils/QueueOnObject.h" #include "DolphinQt/TAS/IRWidget.h" #include "DolphinQt/TAS/TASCheckBox.h" -#include "DolphinQt/TAS/WiiTASInputWindow.h" #include "InputCommon/InputConfig.h" diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp index f283edb7a9..ad79c6f91a 100644 --- a/Source/Core/DolphinQt/ToolBar.cpp +++ b/Source/Core/DolphinQt/ToolBar.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "DolphinQt/ToolBar.h" + #include <algorithm> #include <vector> @@ -12,7 +14,6 @@ #include "DolphinQt/Host.h" #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" -#include "DolphinQt/ToolBar.h" static QSize ICON_SIZE(32, 32); diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 5937f1168f..7a7c548cc6 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "InputCommon/ControllerInterface/Android/Android.h" + #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/Touch/Touchscreen.h" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index e7a8bea6fe..596fd1f109 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" + #include <algorithm> #include <limits> #include <mutex> @@ -11,7 +13,6 @@ #include "Common/Logging/Log.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DInput/DInput.h" -#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" #include "InputCommon/ControllerInterface/DInput/XInputFilter.h" namespace ciface::DInput diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp index 94ae14f3db..4379749e5f 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/DInput/XInputFilter.h" + #include <cwchar> #include <unordered_set> #include <vector> diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index e846ffb0e1..10c30ffb21 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -1,6 +1,8 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/OSX/OSX.h" + #include <thread> #include <Cocoa/Cocoa.h> @@ -12,7 +14,6 @@ #include "Common/Thread.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/OSX/OSX.h" #include "InputCommon/ControllerInterface/OSX/OSXJoystick.h" #include "InputCommon/ControllerInterface/OSX/RunLoopStopper.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp index a273814db6..5c71adec23 100644 --- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/Pipes/Pipes.h" + #include <algorithm> #include <array> #include <cstdlib> @@ -17,7 +19,6 @@ #include "Common/FileUtil.h" #include "Common/StringUtil.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/Pipes/Pipes.h" namespace ciface::Pipes { diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h index 3c1516c714..ab9e987c32 100644 --- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h +++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h @@ -7,6 +7,8 @@ #include <string> #include <vector> +#include "InputCommon/ControllerInterface/ControllerInterface.h" + namespace ciface::Pipes { // To create a piped controller input, create a named pipe in the diff --git a/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp b/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp index 8b8412c932..7b15f92de9 100644 --- a/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp @@ -1,6 +1,8 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/Touch/ButtonManager.h" + #include <array> #include <sstream> #include <string> @@ -23,7 +25,6 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/StickGate.h" -#include "InputCommon/ControllerInterface/Touch/ButtonManager.h" namespace ButtonManager { diff --git a/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.cpp b/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.cpp index ca98dbe040..a4c20b0ae0 100644 --- a/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.cpp @@ -1,14 +1,15 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/Touch/Touchscreen.h" + +#include <sstream> +#include <thread> #ifdef ANDROID #include <jni/AndroidCommon/IDCache.h> #endif -#include <sstream> -#include <thread> #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/Touch/Touchscreen.h" namespace ciface::Touch { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 689b4fcf7b..1f8e107987 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -1,6 +1,8 @@ // Copyright 2013 Max Eliaser // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/Xlib/XInput2.h" + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wregister" #include <X11/XKBlib.h> @@ -11,8 +13,6 @@ #include <fmt/format.h> -#include "InputCommon/ControllerInterface/Xlib/XInput2.h" - #include "Common/StringUtil.h" // This is an input plugin using the XInput 2.0 extension to the X11 protocol, diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index f4b83f2056..43662edb8b 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/ControllerInterface/evdev/evdev.h" + #include <algorithm> #include <cstring> #include <map> @@ -20,7 +22,6 @@ #include "Common/StringUtil.h" #include "Common/Thread.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/evdev/evdev.h" namespace ciface::evdev { diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp index 410d6e4155..416fa30523 100644 --- a/Source/Core/InputCommon/GCAdapter_Android.cpp +++ b/Source/Core/InputCommon/GCAdapter_Android.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/GCAdapter.h" + #include <algorithm> #include <array> #include <jni.h> @@ -17,7 +19,6 @@ #include "Core/HW/SI/SI_Device.h" #include "Core/HW/SystemTimers.h" -#include "InputCommon/GCAdapter.h" #include "InputCommon/GCPadStatus.h" #include "jni/AndroidCommon/IDCache.h" diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index ad044ea79e..5e64b60f61 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -1,6 +1,8 @@ // Copyright 2010 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "InputCommon/InputConfig.h" + #include <vector> #include "Common/Config/Config.h" @@ -15,7 +17,6 @@ #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/InputConfig.h" #include "InputCommon/InputProfile.h" InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name, diff --git a/Source/Core/UICommon/CommandLineParse.cpp b/Source/Core/UICommon/CommandLineParse.cpp index 5f312d3c9d..7ac1bafe36 100644 --- a/Source/Core/UICommon/CommandLineParse.cpp +++ b/Source/Core/UICommon/CommandLineParse.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "UICommon/CommandLineParse.h" + #include <list> #include <optional> #include <sstream> @@ -13,7 +15,6 @@ #include "Common/StringUtil.h" #include "Common/Version.h" #include "Core/Config/MainSettings.h" -#include "UICommon/CommandLineParse.h" namespace CommandLineParse { diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 5acf58351f..5c34c6b902 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "UICommon/UICommon.h" + #include <algorithm> #include <clocale> #include <cmath> @@ -35,7 +37,6 @@ #include "InputCommon/GCAdapter.h" #include "UICommon/DiscordPresence.h" -#include "UICommon/UICommon.h" #include "UICommon/USBUtils.h" #ifdef HAVE_X11 diff --git a/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp index f4ab892a18..830ae1f9a4 100644 --- a/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp @@ -1,12 +1,13 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D/D3DBoundingBox.h" + #include <algorithm> #include <array> #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" -#include "VideoBackends/D3D/D3DBoundingBox.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3DCommon/D3DCommon.h" diff --git a/Source/Core/VideoBackends/D3D/D3DMain.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp index f101f60321..a74fb1bb2f 100644 --- a/Source/Core/VideoBackends/D3D/D3DMain.cpp +++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D/VideoBackend.h" + #include <memory> #include <string> @@ -15,7 +17,6 @@ #include "VideoBackends/D3D/D3DRender.h" #include "VideoBackends/D3D/D3DSwapChain.h" #include "VideoBackends/D3D/D3DVertexManager.h" -#include "VideoBackends/D3D/VideoBackend.h" #include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp index 63d5a61cca..7fd103d0bd 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.cpp +++ b/Source/Core/VideoBackends/D3D/D3DState.cpp @@ -1,6 +1,8 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D/D3DState.h" + #include <algorithm> #include <array> @@ -10,7 +12,6 @@ #include "Common/MsgHandler.h" #include "VideoBackends/D3D/D3DBase.h" -#include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/DXTexture.h" #include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp index feec0fab5c..95ed7fdb2a 100644 --- a/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp +++ b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D/D3DSwapChain.h" + #include "VideoBackends/D3D/DXTexture.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.cpp b/Source/Core/VideoBackends/D3D/DXPipeline.cpp index 0012d38403..0bdfeb0012 100644 --- a/Source/Core/VideoBackends/D3D/DXPipeline.cpp +++ b/Source/Core/VideoBackends/D3D/DXPipeline.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D/DXPipeline.h" + #include "Common/Assert.h" #include "Common/Logging/Log.h" @@ -8,7 +10,6 @@ #include "VideoBackends/D3D/D3DRender.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/D3DVertexManager.h" -#include "VideoBackends/D3D/DXPipeline.h" #include "VideoBackends/D3D/DXShader.h" #include "VideoBackends/D3D/DXTexture.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.h b/Source/Core/VideoBackends/D3D/DXPipeline.h index 1dc1f9b8de..611f709ecc 100644 --- a/Source/Core/VideoBackends/D3D/DXPipeline.h +++ b/Source/Core/VideoBackends/D3D/DXPipeline.h @@ -5,6 +5,8 @@ #include <d3d11.h> #include <memory> + +#include "VideoBackends/D3D/D3DBase.h" #include "VideoCommon/AbstractPipeline.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/DXShader.cpp b/Source/Core/VideoBackends/D3D/DXShader.cpp index 58d2ed6bf8..9f7619ce76 100644 --- a/Source/Core/VideoBackends/D3D/DXShader.cpp +++ b/Source/Core/VideoBackends/D3D/DXShader.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D/DXShader.h" + #include "Common/Assert.h" + #include "VideoBackends/D3D/D3DBase.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp index 1247b32fc7..097c4c28de 100644 --- a/Source/Core/VideoBackends/D3D/DXTexture.cpp +++ b/Source/Core/VideoBackends/D3D/DXTexture.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D/DXTexture.h" + #include <algorithm> #include <cstddef> @@ -9,7 +11,6 @@ #include "Common/Logging/Log.h" #include "VideoBackends/D3D/D3DState.h" -#include "VideoBackends/D3D/DXTexture.h" #include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D/DXTexture.h b/Source/Core/VideoBackends/D3D/DXTexture.h index a49b4902e4..2248d45694 100644 --- a/Source/Core/VideoBackends/D3D/DXTexture.h +++ b/Source/Core/VideoBackends/D3D/DXTexture.h @@ -7,8 +7,10 @@ #include <memory> #include <string> #include <string_view> + #include "Common/CommonTypes.h" +#include "VideoBackends/D3D/D3DBase.h" #include "VideoCommon/AbstractFramebuffer.h" #include "VideoCommon/AbstractStagingTexture.h" #include "VideoCommon/AbstractTexture.h" diff --git a/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp index 9a548f0111..3c326455dd 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D12/D3D12BoundingBox.h" + #include "Common/Logging/Log.h" + #include "VideoBackends/D3D12/D3D12Renderer.h" #include "VideoBackends/D3D12/DX12Context.h" diff --git a/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp index 60ba5eddc5..ece8f14d88 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp @@ -1,12 +1,13 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D12/D3D12Renderer.h" + #include "Common/Logging/Log.h" #include "VideoBackends/D3D12/Common.h" #include "VideoBackends/D3D12/D3D12BoundingBox.h" #include "VideoBackends/D3D12/D3D12PerfQuery.h" -#include "VideoBackends/D3D12/D3D12Renderer.h" #include "VideoBackends/D3D12/D3D12SwapChain.h" #include "VideoBackends/D3D12/DX12Context.h" #include "VideoBackends/D3D12/DX12Pipeline.h" diff --git a/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp index 5557fbfe2e..f7607fb437 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D12/D3D12SwapChain.h" + #include "VideoBackends/D3D12/DX12Context.h" #include "VideoBackends/D3D12/DX12Texture.h" diff --git a/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp index 057e662df2..b85e4e459c 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp @@ -1,8 +1,6 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/CommonTypes.h" - #include "VideoBackends/D3D12/D3D12VertexManager.h" #include "Common/Align.h" diff --git a/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp index 776f1a8811..aa20f35bd6 100644 --- a/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp @@ -1,12 +1,13 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D12/DX12Pipeline.h" + #include "Common/Assert.h" #include "Common/MsgHandler.h" #include "VideoBackends/D3D12/Common.h" #include "VideoBackends/D3D12/DX12Context.h" -#include "VideoBackends/D3D12/DX12Pipeline.h" #include "VideoBackends/D3D12/DX12Shader.h" #include "VideoBackends/D3D12/DX12Texture.h" #include "VideoBackends/D3D12/DX12VertexFormat.h" diff --git a/Source/Core/VideoBackends/D3D12/DX12Texture.cpp b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp index 34d0670a1f..69b9b754d1 100644 --- a/Source/Core/VideoBackends/D3D12/DX12Texture.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp @@ -2,9 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D12/DX12Texture.h" + #include "Common/Align.h" #include "Common/Assert.h" #include "Common/StringUtil.h" + #include "VideoBackends/D3D12/Common.h" #include "VideoBackends/D3D12/D3D12Renderer.h" #include "VideoBackends/D3D12/D3D12StreamBuffer.h" diff --git a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp index 5bd022d779..bfc1c43d8c 100644 --- a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp +++ b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D12/DescriptorAllocator.h" + #include "VideoBackends/D3D12/DX12Context.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp index 537561559c..e175d6ef63 100644 --- a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp +++ b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/D3D12/DescriptorHeapManager.h" + #include "Common/Assert.h" + #include "VideoBackends/D3D12/DX12Context.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp index a82dd428a5..c3fd307a06 100644 --- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp +++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3D12/VideoBackend.h" + #include <string> #include "Common/CommonTypes.h" @@ -14,7 +16,6 @@ #include "VideoBackends/D3D12/D3D12SwapChain.h" #include "VideoBackends/D3D12/D3D12VertexManager.h" #include "VideoBackends/D3D12/DX12Context.h" -#include "VideoBackends/D3D12/VideoBackend.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/ShaderCache.h" diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp index 075c5abec6..0f491af434 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp @@ -1,6 +1,8 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3DCommon/D3DCommon.h" + #include <d3d11.h> #include <d3d12.h> #include <dxgi1_3.h> @@ -10,7 +12,7 @@ #include "Common/DynamicLibrary.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "VideoBackends/D3DCommon/D3DCommon.h" + #include "VideoCommon/TextureConfig.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3DCommon/Shader.cpp b/Source/Core/VideoBackends/D3DCommon/Shader.cpp index 26eeb78092..15be6cff43 100644 --- a/Source/Core/VideoBackends/D3DCommon/Shader.cpp +++ b/Source/Core/VideoBackends/D3DCommon/Shader.cpp @@ -1,6 +1,8 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/D3DCommon/Shader.h" + #include <fstream> #include <wrl/client.h> @@ -11,8 +13,6 @@ #include "Common/StringUtil.h" #include "Common/Version.h" -#include "VideoBackends/D3DCommon/Shader.h" - #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp index 78ce7f1afe..d6bd70c50a 100644 --- a/Source/Core/VideoBackends/Null/NullBackend.cpp +++ b/Source/Core/VideoBackends/Null/NullBackend.cpp @@ -6,15 +6,16 @@ // This backend tries not to do anything in the backend, // but everything in VideoCommon. -#include "VideoBackends/Null/NullRender.h" -#include "VideoBackends/Null/NullVertexManager.h" -#include "VideoBackends/Null/PerfQuery.h" -#include "VideoBackends/Null/TextureCache.h" #include "VideoBackends/Null/VideoBackend.h" #include "Common/Common.h" #include "Common/MsgHandler.h" +#include "VideoBackends/Null/NullRender.h" +#include "VideoBackends/Null/NullVertexManager.h" +#include "VideoBackends/Null/PerfQuery.h" +#include "VideoBackends/Null/TextureCache.h" + #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp index 537058a565..b83c3af638 100644 --- a/Source/Core/VideoBackends/OGL/OGLMain.cpp +++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp @@ -33,6 +33,8 @@ Make AA apply instantly during gameplay if possible */ +#include "VideoBackends/OGL/VideoBackend.h" + #include <memory> #include <string> #include <vector> @@ -49,7 +51,6 @@ Make AA apply instantly during gameplay if possible #include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/VideoBackend.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/TextureCacheBase.h" diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp index ee45fe868b..b4962cf270 100644 --- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp +++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp @@ -1,9 +1,10 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/OGL/OGLPipeline.h" + #include "Common/Assert.h" -#include "VideoBackends/OGL/OGLPipeline.h" #include "VideoBackends/OGL/OGLRender.h" #include "VideoBackends/OGL/OGLShader.h" #include "VideoBackends/OGL/OGLVertexManager.h" diff --git a/Source/Core/VideoBackends/OGL/OGLShader.cpp b/Source/Core/VideoBackends/OGL/OGLShader.cpp index 11914f0355..4ba2143c6e 100644 --- a/Source/Core/VideoBackends/OGL/OGLShader.cpp +++ b/Source/Core/VideoBackends/OGL/OGLShader.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/OGL/OGLShader.h" + #include "VideoBackends/OGL/ProgramShaderCache.h" namespace OGL diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp index 83c1d1b419..cf3c5f772b 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp +++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp @@ -1,11 +1,12 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/OGL/OGLTexture.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" -#include "VideoBackends/OGL/OGLTexture.h" #include "VideoBackends/OGL/SamplerCache.h" namespace OGL diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp index 286f654de2..ed14c11a47 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.cpp +++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/OGLRender.h" #include <memory> #include "Common/CommonTypes.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoCommon/VideoConfig.h" namespace OGL diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp index 31fdf3f421..c23ca5622c 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.cpp +++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/Software/EfbCopy.h" + #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp index 0b185aeb64..387375cc85 100644 --- a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp +++ b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp @@ -1,6 +1,8 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Software/SWOGLWindow.h" + #include <memory> #include "Common/GL/GLContext.h" @@ -8,7 +10,6 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "VideoBackends/Software/SWOGLWindow.h" #include "VideoBackends/Software/SWTexture.h" SWOGLWindow::SWOGLWindow() = default; diff --git a/Source/Core/VideoBackends/Software/SWTexture.cpp b/Source/Core/VideoBackends/Software/SWTexture.cpp index a70f1b0704..082c26371e 100644 --- a/Source/Core/VideoBackends/Software/SWTexture.cpp +++ b/Source/Core/VideoBackends/Software/SWTexture.cpp @@ -2,12 +2,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/Software/SWTexture.h" -#include "VideoBackends/Software/SWRenderer.h" #include <cstring> + #include "Common/Assert.h" #include "VideoBackends/Software/CopyRegion.h" +#include "VideoBackends/Software/SWRenderer.h" namespace SW { diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index fa6f89ba2d..6a12c467d8 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -1,6 +1,8 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Software/VideoBackend.h" + #include <cstring> #include <memory> #include <string> @@ -20,7 +22,6 @@ #include "VideoBackends/Software/SWTexture.h" #include "VideoBackends/Software/SWVertexLoader.h" #include "VideoBackends/Software/TextureCache.h" -#include "VideoBackends/Software/VideoBackend.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/TextureCacheBase.h" diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp index d73bdfc572..b2488a63d8 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.cpp +++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp @@ -1,14 +1,12 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <cstring> - #include "VideoBackends/Software/SetupUnit.h" -#include "Common/Logging/Log.h" +#include <cstring> +#include "Common/Logging/Log.h" #include "VideoBackends/Software/Clipper.h" - #include "VideoCommon/OpcodeDecoding.h" void SetupUnit::Init(u8 primitiveType) diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp index a06cab771e..c28b3cced2 100644 --- a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp +++ b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoBackends/Vulkan/ShaderCompiler.h" -#include "VideoBackends/Vulkan/VulkanContext.h" #include <cstddef> #include <cstdlib> @@ -23,6 +22,7 @@ #include "Common/StringUtil.h" #include "Common/Version.h" +#include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp index af0152f8b4..5030350282 100644 --- a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp +++ b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp @@ -1,13 +1,14 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/StagingBuffer.h" + #include <algorithm> #include <cstring> #include "Common/Assert.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" -#include "VideoBackends/Vulkan/StagingBuffer.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp index 7e4b13408a..3138a31602 100644 --- a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VKBoundingBox.h" + #include <vector> #include "Common/Logging/Log.h" @@ -9,7 +11,6 @@ #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoBackends/Vulkan/StagingBuffer.h" #include "VideoBackends/Vulkan/StateTracker.h" -#include "VideoBackends/Vulkan/VKBoundingBox.h" #include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VulkanContext.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKMain.cpp b/Source/Core/VideoBackends/Vulkan/VKMain.cpp index abe531aac3..56cf93a376 100644 --- a/Source/Core/VideoBackends/Vulkan/VKMain.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKMain.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VideoBackend.h" + #include <vector> #include "Common/Logging/LogManager.h" @@ -14,7 +16,6 @@ #include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VKSwapChain.h" #include "VideoBackends/Vulkan/VKVertexManager.h" -#include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp b/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp index 35c092c147..db5037f427 100644 --- a/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VKRenderer.h" + #include <algorithm> #include <cstddef> #include <cstdio> @@ -22,7 +24,6 @@ #include "VideoBackends/Vulkan/VKBoundingBox.h" #include "VideoBackends/Vulkan/VKPerfQuery.h" #include "VideoBackends/Vulkan/VKPipeline.h" -#include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VKShader.h" #include "VideoBackends/Vulkan/VKStreamBuffer.h" #include "VideoBackends/Vulkan/VKSwapChain.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKShader.cpp b/Source/Core/VideoBackends/Vulkan/VKShader.cpp index cd910b898a..3d5beae387 100644 --- a/Source/Core/VideoBackends/Vulkan/VKShader.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKShader.cpp @@ -1,12 +1,13 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VKShader.h" + #include "Common/Align.h" #include "Common/Assert.h" #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoBackends/Vulkan/ShaderCompiler.h" -#include "VideoBackends/Vulkan/VKShader.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index f744eb2e79..98128c85f6 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VKTexture.h" + #include <algorithm> #include <cstddef> #include <cstring> @@ -17,7 +19,6 @@ #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VKStreamBuffer.h" -#include "VideoBackends/Vulkan/VKTexture.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp index a571c6c38d..d8a2ab0a47 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VulkanContext.h" + #include <algorithm> #include <array> #include <cstring> @@ -11,7 +13,6 @@ #include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp index 7c94da05e7..6b1f688e78 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoBackends/Vulkan/VulkanLoader.h" + #include <atomic> #include <cstdarg> #include <cstdlib> @@ -10,8 +12,6 @@ #include "Common/FileUtil.h" #include "Common/StringUtil.h" -#include "VideoBackends/Vulkan/VulkanLoader.h" - #define VULKAN_MODULE_ENTRY_POINT(name, required) PFN_##name name; #define VULKAN_INSTANCE_ENTRY_POINT(name, required) PFN_##name name; #define VULKAN_DEVICE_ENTRY_POINT(name, required) PFN_##name name; diff --git a/Source/Core/VideoCommon/AbstractStagingTexture.cpp b/Source/Core/VideoCommon/AbstractStagingTexture.cpp index 002ecd7f17..ef7e33db60 100644 --- a/Source/Core/VideoCommon/AbstractStagingTexture.cpp +++ b/Source/Core/VideoCommon/AbstractStagingTexture.cpp @@ -1,12 +1,13 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/AbstractStagingTexture.h" + #include <algorithm> #include <cstring> #include "Common/Assert.h" #include "Common/MsgHandler.h" -#include "VideoCommon/AbstractStagingTexture.h" #include "VideoCommon/AbstractTexture.h" AbstractStagingTexture::AbstractStagingTexture(StagingTextureType type, const TextureConfig& c) diff --git a/Source/Core/VideoCommon/AbstractTexture.cpp b/Source/Core/VideoCommon/AbstractTexture.cpp index 9b67c8077e..fb34e2413e 100644 --- a/Source/Core/VideoCommon/AbstractTexture.cpp +++ b/Source/Core/VideoCommon/AbstractTexture.cpp @@ -1,13 +1,14 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/AbstractTexture.h" + #include <algorithm> #include "Common/Assert.h" #include "Common/Image.h" #include "Common/MsgHandler.h" #include "VideoCommon/AbstractStagingTexture.h" -#include "VideoCommon/AbstractTexture.h" #include "VideoCommon/RenderBase.h" AbstractTexture::AbstractTexture(const TextureConfig& c) : m_config(c) diff --git a/Source/Core/VideoCommon/AsyncRequests.cpp b/Source/Core/VideoCommon/AsyncRequests.cpp index 10f5b37ae9..f8306ddc3e 100644 --- a/Source/Core/VideoCommon/AsyncRequests.cpp +++ b/Source/Core/VideoCommon/AsyncRequests.cpp @@ -1,9 +1,10 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/AsyncRequests.h" + #include <mutex> -#include "VideoCommon/AsyncRequests.h" #include "VideoCommon/Fifo.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" diff --git a/Source/Core/VideoCommon/AsyncShaderCompiler.cpp b/Source/Core/VideoCommon/AsyncShaderCompiler.cpp index 82625f6e16..7e13168f69 100644 --- a/Source/Core/VideoCommon/AsyncShaderCompiler.cpp +++ b/Source/Core/VideoCommon/AsyncShaderCompiler.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoCommon/AsyncShaderCompiler.h" + #include <thread> + #include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Common/Thread.h" diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index bca9f3b21d..83784a137f 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/CommandProcessor.h" + #include <atomic> #include <cstring> @@ -14,7 +16,6 @@ #include "Core/HW/GPFifo.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" -#include "VideoCommon/CommandProcessor.h" #include "VideoCommon/Fifo.h" namespace CommandProcessor diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index 6029654e57..c7f6412e8d 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -1,10 +1,11 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/DriverDetails.h" + #include <map> #include "Common/Logging/LogManager.h" -#include "VideoCommon/DriverDetails.h" namespace DriverDetails { diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index efc351fe21..4d71a7c462 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -1,6 +1,8 @@ // Copyright 2012 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/FPSCounter.h" + #include <fstream> #include <iomanip> @@ -8,7 +10,6 @@ #include "Common/FileUtil.h" #include "Common/Timer.h" #include "Core/Core.h" -#include "VideoCommon/FPSCounter.h" #include "VideoCommon/VideoConfig.h" static constexpr u64 FPS_REFRESH_INTERVAL = 250000; diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index 3afeb1df0d..f488ed7343 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -1,12 +1,13 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/GeometryShaderManager.h" + #include <cstring> #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" -#include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoCommon/TMEM.cpp b/Source/Core/VideoCommon/TMEM.cpp index c172ce37e5..8b5404ab08 100644 --- a/Source/Core/VideoCommon/TMEM.cpp +++ b/Source/Core/VideoCommon/TMEM.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoCommon/TMEM.h" + #include <array> #include "Common/ChunkFile.h" - #include "VideoCommon/BPMemory.h" -#include "VideoCommon/TMEM.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Source/Core/VideoCommon/TMEM.h b/Source/Core/VideoCommon/TMEM.h index 786e98d04c..6a1eff4796 100644 --- a/Source/Core/VideoCommon/TMEM.h +++ b/Source/Core/VideoCommon/TMEM.h @@ -5,6 +5,7 @@ #pragma once #include "Common/BitSet.h" +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" diff --git a/Source/Core/VideoCommon/TextureConfig.cpp b/Source/Core/VideoCommon/TextureConfig.cpp index e63850d987..34fd9324df 100644 --- a/Source/Core/VideoCommon/TextureConfig.cpp +++ b/Source/Core/VideoCommon/TextureConfig.cpp @@ -2,10 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoCommon/TextureConfig.h" -#include "VideoCommon/AbstractTexture.h" #include <tuple> +#include "VideoCommon/AbstractTexture.h" + bool TextureConfig::operator==(const TextureConfig& o) const { return std::tie(width, height, levels, layers, samples, format, flags) == diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index f56339453e..46a2252b7d 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/TextureDecoder.h" + #include <algorithm> #include <cmath> @@ -9,9 +11,7 @@ #include "Common/Swap.h" #include "VideoCommon/LookUpTables.h" -#include "VideoCommon/TextureDecoder.h" #include "VideoCommon/TextureDecoder_Util.h" -//#include "VideoCommon/VideoCommon.h" // to get debug logs #include "VideoCommon/VideoConfig.h" // GameCube/Wii texture decoder @@ -116,8 +116,8 @@ static inline void DecodeBytes_IA4(u32* dst, const u8* src) static inline void DecodeBytes_RGB5A3(u32* dst, const u16* src) { #if 0 - for (int x = 0; x < 4; x++) - dst[x] = DecodePixel_RGB5A3(Common::swap16(src[x])); + for (int x = 0; x < 4; x++) + dst[x] = DecodePixel_RGB5A3(Common::swap16(src[x])); #else dst[0] = DecodePixel_RGB5A3(Common::swap16(src[0])); dst[1] = DecodePixel_RGB5A3(Common::swap16(src[1])); @@ -129,10 +129,10 @@ static inline void DecodeBytes_RGB5A3(u32* dst, const u16* src) static inline void DecodeBytes_RGBA8(u32* dst, const u16* src, const u16* src2) { #if 0 - for (int x = 0; x < 4; x++) - { - dst[x] = ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8) | (src2[x] << 8); - } + for (int x = 0; x < 4; x++) + { + dst[x] = ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8) | (src2[x] << 8); + } #else dst[0] = ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00) >> 8) | (src2[0] << 8); dst[1] = ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00) >> 8) | (src2[1] << 8); diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 7d60bd1772..761fc0cd64 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/TextureDecoder.h" + #include <algorithm> #include <cmath> #include <cstring> @@ -16,7 +18,6 @@ #include "Common/Swap.h" #include "VideoCommon/LookUpTables.h" -#include "VideoCommon/TextureDecoder.h" #include "VideoCommon/TextureDecoder_Util.h" // GameCube/Wii texture decoder diff --git a/Source/Core/VideoCommon/UberShaderCommon.cpp b/Source/Core/VideoCommon/UberShaderCommon.cpp index 283d11ffdd..4a8fba8839 100644 --- a/Source/Core/VideoCommon/UberShaderCommon.cpp +++ b/Source/Core/VideoCommon/UberShaderCommon.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "VideoCommon/UberShaderCommon.h" + #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp index 6c7ae2097e..4f2e04b0b4 100644 --- a/Source/Core/VideoCommon/VertexLoader_Color.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/VertexLoader_Color.h" + #include <cstring> #include "Common/CommonTypes.h" @@ -10,7 +12,6 @@ #include "VideoCommon/VertexLoader.h" #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexLoaderUtils.h" -#include "VideoCommon/VertexLoader_Color.h" namespace { diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 88ec126c7c..a5c9834dc8 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/VideoConfig.h" + #include <algorithm> #include "Common/CPUDetect.h" @@ -12,7 +14,6 @@ #include "Core/Movie.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoCommon.h" -#include "VideoCommon/VideoConfig.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index dc5ed9336e..c348649da5 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/Source/Core/VideoCommon/VideoState.cpp @@ -1,6 +1,8 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "VideoCommon/VideoState.h" + #include <cstring> #include "Common/ChunkFile.h" @@ -18,7 +20,6 @@ #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexShaderManager.h" -#include "VideoCommon/VideoState.h" #include "VideoCommon/XFMemory.h" void VideoCommon_DoState(PointerWrap& p) |