From c91169e702aa9a3e4e0f29d736fe2fecbe69f8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 19 Dec 2024 09:53:07 +0100 Subject: [PATCH] Restore removed includes. Turns out these were needed after all. For some reason, on Windows and Mac, gets auto-included by something else so I don't notice when it's missing, and MSVC's include dependency tracker doesn't see it either. --- Common/CPUDetect.cpp | 1 + Common/Data/Encoding/Utf8.cpp | 2 +- Common/GPU/Vulkan/VulkanImage.cpp | 2 ++ Common/GPU/Vulkan/VulkanImage.h | 1 + Common/GPU/Vulkan/VulkanMemory.cpp | 5 +---- Common/Render/DrawBuffer.cpp | 5 +++-- Core/Debugger/MemBlockInfo.cpp | 1 + Core/Dialog/PSPGamedataInstallDialog.cpp | 2 +- Core/Dialog/PSPMsgDialog.cpp | 1 + Core/Dialog/PSPNetconfDialog.cpp | 2 +- Core/Dialog/PSPNpSigninDialog.cpp | 4 +--- Core/Dialog/PSPOskDialog.cpp | 9 ++++----- Core/Dialog/PSPSaveDialog.cpp | 2 ++ Core/Dialog/SavedataParam.cpp | 1 + Core/FileLoaders/CachingFileLoader.cpp | 1 + Core/FileLoaders/DiskCachingFileLoader.cpp | 1 + Core/FileLoaders/RamCachingFileLoader.cpp | 1 + Core/FileSystems/BlockDevices.cpp | 1 + Core/FileSystems/ISOFileSystem.cpp | 1 + Core/Font/PGF.cpp | 1 + Core/HLE/ReplaceTables.cpp | 2 ++ Core/HW/MemoryStick.cpp | 4 ++++ Core/HW/StereoResampler.cpp | 1 + Core/MemMap.cpp | 1 + Core/RetroAchievements.cpp | 2 +- Core/Screenshot.cpp | 2 ++ GPU/Common/GPUStateUtils.cpp | 1 + GPU/Common/PresentationCommon.cpp | 2 +- GPU/Common/SoftwareTransformCommon.cpp | 1 + GPU/Common/TextureScalerCommon.cpp | 1 + GPU/Common/TextureShaderCommon.cpp | 3 +++ GPU/Common/VertexDecoderCommon.cpp | 4 ++++ GPU/D3D11/StateMappingD3D11.cpp | 1 + Windows/Debugger/CtrlDisAsmView.h | 3 +++ 34 files changed, 53 insertions(+), 19 deletions(-) diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp index d148200911..8fdb524655 100644 --- a/Common/CPUDetect.cpp +++ b/Common/CPUDetect.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "Common/Common.h" #include "Common/CPUDetect.h" diff --git a/Common/Data/Encoding/Utf8.cpp b/Common/Data/Encoding/Utf8.cpp index eb4eb1b082..84c72f8b08 100644 --- a/Common/Data/Encoding/Utf8.cpp +++ b/Common/Data/Encoding/Utf8.cpp @@ -22,7 +22,7 @@ #include #include #include - +#include #include #include "Common/Data/Encoding/Utf8.h" diff --git a/Common/GPU/Vulkan/VulkanImage.cpp b/Common/GPU/Vulkan/VulkanImage.cpp index 35da86c073..b44300f53a 100644 --- a/Common/GPU/Vulkan/VulkanImage.cpp +++ b/Common/GPU/Vulkan/VulkanImage.cpp @@ -1,3 +1,5 @@ +#include + #include "Common/Log.h" #include "Common/GPU/Vulkan/VulkanContext.h" #include "Common/GPU/Vulkan/VulkanAlloc.h" diff --git a/Common/GPU/Vulkan/VulkanImage.h b/Common/GPU/Vulkan/VulkanImage.h index 05e6039108..f3b6c4315b 100644 --- a/Common/GPU/Vulkan/VulkanImage.h +++ b/Common/GPU/Vulkan/VulkanImage.h @@ -1,5 +1,6 @@ #pragma once +#include #include "VulkanLoader.h" class VulkanContext; diff --git a/Common/GPU/Vulkan/VulkanMemory.cpp b/Common/GPU/Vulkan/VulkanMemory.cpp index 252777d343..55f4e6aba3 100644 --- a/Common/GPU/Vulkan/VulkanMemory.cpp +++ b/Common/GPU/Vulkan/VulkanMemory.cpp @@ -18,14 +18,11 @@ // Additionally, Common/Vulkan/* , including this file, are also licensed // under the public domain. -#include -#include - +#include #include "Common/Math/math_util.h" #include "Common/Log.h" #include "Common/TimeUtil.h" -#include "Common/Math/math_util.h" #include "Common/GPU/Vulkan/VulkanMemory.h" #include "Common/Data/Text/Parsers.h" diff --git a/Common/Render/DrawBuffer.cpp b/Common/Render/DrawBuffer.cpp index f077409205..74e76c44db 100644 --- a/Common/Render/DrawBuffer.cpp +++ b/Common/Render/DrawBuffer.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include "Common/System/Display.h" @@ -578,7 +579,7 @@ void DrawBuffer::DrawTextRect(FontID font, std::string_view text, float x, float float totalWidth, totalHeight; MeasureTextRect(font, toDraw, Bounds(x, y, w, h), &totalWidth, &totalHeight, align); - std::vector lines; + std::vector lines; SplitString(toDraw, '\n', lines); float baseY = y; @@ -591,7 +592,7 @@ void DrawBuffer::DrawTextRect(FontID font, std::string_view text, float x, float } // This allows each line to be horizontally centered by itself. - for (const std::string &line : lines) { + for (std::string_view line : lines) { DrawText(font, line, x, baseY, color, align); float tw, th; diff --git a/Core/Debugger/MemBlockInfo.cpp b/Core/Debugger/MemBlockInfo.cpp index fbdb81b96c..b6a609abff 100644 --- a/Core/Debugger/MemBlockInfo.cpp +++ b/Core/Debugger/MemBlockInfo.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include #include diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index 19443e56d9..884c5519ee 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -15,10 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include "Common/CommonTypes.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Common/System/OSD.h" #include "Core/ELF/ParamSFO.h" #include "Core/MemMapHelpers.h" #include "Core/Reporting.h" diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index d93be5ac2a..2e7a8efe4c 100755 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index 59ec57bff7..1c691dd7ab 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "Common/CommonWindows.h" +#include #include "Common/TimeUtil.h" #include "Common/Data/Text/I18n.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/Dialog/PSPNpSigninDialog.cpp b/Core/Dialog/PSPNpSigninDialog.cpp index e2190787b0..11207bd757 100644 --- a/Core/Dialog/PSPNpSigninDialog.cpp +++ b/Core/Dialog/PSPNpSigninDialog.cpp @@ -15,9 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#if defined(_WIN32) -#include "Common/CommonWindows.h" -#endif +#include #include "Common/TimeUtil.h" #include "Common/Data/Text/I18n.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index d4c81fa4ff..9f9b376668 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -16,6 +16,10 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" + +#include +#include +#include #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" #include "Common/Data/Encoding/Utf8.h" @@ -31,11 +35,6 @@ #include "Core/Config.h" #include "Core/Reporting.h" -#ifndef _WIN32 -#include -#include -#endif - // These are rough, it seems to take a long time to init, and probably depends on threads. // TODO: This takes like 700ms on a PSP but that's annoyingly long. const static int OSK_INIT_DELAY_US = 300000; diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 00856112c9..e0f661d201 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -22,6 +22,8 @@ #endif #endif + +#include #include #include "Common/Data/Encoding/Utf8.h" diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 63bbd370ca..88ce8173ae 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include "Common/Log.h" #include "Common/Data/Text/I18n.h" diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp index 8c79f2795a..5a419502e6 100644 --- a/Core/FileLoaders/CachingFileLoader.cpp +++ b/Core/FileLoaders/CachingFileLoader.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index b0400ce661..12b715072c 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -17,6 +17,7 @@ #include "ppsspp_config.h" +#include #include #include #include diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp index 11de0391bb..826e0b11c4 100644 --- a/Core/FileLoaders/RamCachingFileLoader.cpp +++ b/Core/FileLoaders/RamCachingFileLoader.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index d1dadf9443..733a6af1f9 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include "Common/Data/Text/I18n.h" diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp index 820612b5c3..8ccd3e9091 100644 --- a/Core/FileSystems/ISOFileSystem.cpp +++ b/Core/FileSystems/ISOFileSystem.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp index db6f44c9ce..b3503a727f 100644 --- a/Core/Font/PGF.cpp +++ b/Core/Font/PGF.cpp @@ -20,6 +20,7 @@ // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code. // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3. +#include #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/MemMap.h" diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index 2ea4ae5511..5711374c62 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -16,6 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" + +#include #include #include diff --git a/Core/HW/MemoryStick.cpp b/Core/HW/MemoryStick.cpp index e4632b5571..643c97e865 100644 --- a/Core/HW/MemoryStick.cpp +++ b/Core/HW/MemoryStick.cpp @@ -15,6 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include +#include +#include +#include #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/File/DiskFree.h" diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp index c727334168..38909c93e5 100644 --- a/Core/HW/StereoResampler.cpp +++ b/Core/HW/StereoResampler.cpp @@ -33,6 +33,7 @@ #define CONTROL_AVG 32.0f #include "ppsspp_config.h" +#include #include #include diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 32483fb0fc..14b8e66d86 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -21,6 +21,7 @@ #include "Common/CommonWindows.h" #endif +#include #include #include "Common/CommonTypes.h" diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index a4a510be7d..ffc65f2316 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -12,7 +12,7 @@ // md5_hash(PSP_GAME/EBOOT.BIN) // hash = md5_finalize() -#include +#include #include #include #include diff --git a/Core/Screenshot.cpp b/Core/Screenshot.cpp index 5f85441e2e..8e5919ce28 100644 --- a/Core/Screenshot.cpp +++ b/Core/Screenshot.cpp @@ -17,6 +17,8 @@ #include "ppsspp_config.h" +#include + #include #include "ext/jpge/jpge.h" diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp index 776c9946ed..e9a347b700 100644 --- a/GPU/Common/GPUStateUtils.cpp +++ b/GPU/Common/GPUStateUtils.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" +#include #include #include "Core/ConfigValues.h" diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index b9983ccf31..3b862c88c4 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -15,10 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include #include - #include "Common/GPU/thin3d.h" #include "Common/System/Display.h" diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index df9caba42a..b05ec9100b 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include "Common/CPUDetect.h" diff --git a/GPU/Common/TextureScalerCommon.cpp b/GPU/Common/TextureScalerCommon.cpp index 246dbf6d66..270d3a535c 100644 --- a/GPU/Common/TextureScalerCommon.cpp +++ b/GPU/Common/TextureScalerCommon.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include #include diff --git a/GPU/Common/TextureShaderCommon.cpp b/GPU/Common/TextureShaderCommon.cpp index 6dfd128d59..08733466d1 100644 --- a/GPU/Common/TextureShaderCommon.cpp +++ b/GPU/Common/TextureShaderCommon.cpp @@ -15,7 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include +#include +#include #include "Common/StringUtils.h" #include "GPU/GPUState.h" diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index 633575fada..12c8f13de0 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -17,6 +17,10 @@ #include "ppsspp_config.h" +#include +#include +#include + #include "Common/CommonTypes.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Log.h" diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp index ecafd09f06..4bdcebeb3e 100644 --- a/GPU/D3D11/StateMappingD3D11.cpp +++ b/GPU/D3D11/StateMappingD3D11.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "Common/Data/Convert/SmallDataConvert.h" diff --git a/Windows/Debugger/CtrlDisAsmView.h b/Windows/Debugger/CtrlDisAsmView.h index c9c980a33f..f227cb5aca 100644 --- a/Windows/Debugger/CtrlDisAsmView.h +++ b/Windows/Debugger/CtrlDisAsmView.h @@ -14,8 +14,11 @@ // To get a class instance to be able to access it, just use // CtrlDisAsmView::getFrom(GetDlgItem(yourdialog, IDC_yourid)). +#include #include +#include #include +#include #include "Common/CommonWindows.h" #include "Common/Log.h"