From df6ed8cfc9bcd9f36f26aa1478cf76efcf37921c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 18 Dec 2024 10:15:12 +0100 Subject: [PATCH] Do some cleanup of #includes in GPU --- Common/Data/Convert/SmallDataConvert.h | 11 +---------- Core/HLE/ReplaceTables.cpp | 8 +------- GPU/Common/DepalettizeShaderCommon.cpp | 1 - GPU/Common/DepthBufferCommon.cpp | 1 - GPU/Common/Draw2D.cpp | 3 --- GPU/Common/DrawEngineCommon.h | 1 - GPU/Common/FramebufferManagerCommon.cpp | 10 ---------- GPU/Common/GPUDebugInterface.cpp | 1 - GPU/Common/GPUStateUtils.cpp | 13 ++++--------- GPU/Common/IndexGenerator.cpp | 16 +--------------- GPU/Common/PostShader.cpp | 2 -- GPU/Common/PresentationCommon.cpp | 1 - GPU/Common/ReinterpretFramebuffer.cpp | 3 --- GPU/Common/ReplacedTexture.cpp | 1 - GPU/Common/ShaderId.cpp | 1 - GPU/Common/SoftwareTransformCommon.cpp | 3 +-- GPU/Common/SplineCommon.cpp | 3 --- GPU/Common/TextureCacheCommon.cpp | 4 ---- GPU/Common/TextureDecoder.cpp | 16 +--------------- GPU/Common/TextureDecoder.h | 2 +- GPU/Common/TextureReplacer.cpp | 8 -------- GPU/Common/TextureScalerCommon.cpp | 11 ++--------- GPU/Common/TextureShaderCommon.cpp | 4 +--- GPU/Common/TransformCommon.cpp | 3 +-- GPU/Common/TransformCommon.h | 1 - GPU/Common/VertexDecoderCommon.cpp | 5 ----- GPU/Common/VertexDecoderHandwritten.cpp | 13 +------------ GPU/Common/VertexShaderGenerator.cpp | 5 ----- GPU/D3D11/DrawEngineD3D11.cpp | 10 ---------- GPU/D3D11/DrawEngineD3D11.h | 4 ---- GPU/D3D11/GPU_D3D11.cpp | 10 ---------- GPU/D3D11/ShaderManagerD3D11.cpp | 6 ------ GPU/D3D11/StateMappingD3D11.cpp | 4 ---- GPU/D3D11/TextureCacheD3D11.cpp | 7 ------- GPU/Directx9/DrawEngineDX9.cpp | 10 +--------- GPU/Directx9/DrawEngineDX9.h | 4 ---- GPU/Directx9/FramebufferManagerDX9.cpp | 1 - GPU/Directx9/GPU_DX9.cpp | 7 ------- GPU/Directx9/GPU_DX9.h | 3 ++- GPU/GLES/DrawEngineGLES.cpp | 13 +------------ GPU/GLES/FragmentTestCacheGLES.cpp | 2 -- GPU/GLES/FramebufferManagerGLES.cpp | 1 - GPU/GLES/GPU_GLES.h | 3 +-- GPU/GLES/ShaderManagerGLES.cpp | 2 -- GPU/GLES/ShaderManagerGLES.h | 2 +- GPU/GLES/StateMappingGLES.cpp | 8 +------- GPU/GLES/StencilBufferGLES.cpp | 2 -- GPU/GLES/TextureCacheGLES.cpp | 9 +-------- GPU/GPUCommon.cpp | 15 +-------------- GPU/GPUCommonHW.cpp | 1 - GPU/GPUState.cpp | 15 +-------------- GPU/Vulkan/DebugVisVulkan.cpp | 4 ---- GPU/Vulkan/DrawEngineVulkan.cpp | 11 ----------- GPU/Vulkan/FramebufferManagerVulkan.cpp | 4 ---- GPU/Vulkan/GPU_Vulkan.cpp | 7 ------- GPU/Vulkan/PipelineManagerVulkan.cpp | 3 --- GPU/Vulkan/ShaderManagerVulkan.cpp | 11 ----------- GPU/Vulkan/StateMappingVulkan.cpp | 5 ----- GPU/Vulkan/TextureCacheVulkan.cpp | 3 --- GPU/Vulkan/VulkanUtil.cpp | 1 + 60 files changed, 26 insertions(+), 313 deletions(-) diff --git a/Common/Data/Convert/SmallDataConvert.h b/Common/Data/Convert/SmallDataConvert.h index 90a9f1f963..f0d9f1846a 100644 --- a/Common/Data/Convert/SmallDataConvert.h +++ b/Common/Data/Convert/SmallDataConvert.h @@ -6,17 +6,8 @@ #include "Common/Common.h" #include "ppsspp_config.h" +#include "Common/Math/CrossSIMD.h" -#ifdef _M_SSE -#include -#endif -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif extern const float one_over_255_x4[4]; extern const float exactly_255_x4[4]; diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index 5007fadf2b..50f4cd8e5c 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -16,15 +16,12 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" -#include #include #include #include "Common/CommonTypes.h" -#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Log.h" #include "Common/Swap.h" -#include "Core/Config.h" #include "Core/System.h" #include "Core/Debugger/Breakpoints.h" #include "Core/Debugger/MemBlockInfo.h" @@ -41,10 +38,7 @@ #include "GPU/GPU.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" - -#if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) -#include -#endif +#include "Common/Math/CrossSIMD.h" enum class GPUReplacementSkip { MEMSET = 1, diff --git a/GPU/Common/DepalettizeShaderCommon.cpp b/GPU/Common/DepalettizeShaderCommon.cpp index b8162d26f9..2d70fd95e7 100644 --- a/GPU/Common/DepalettizeShaderCommon.cpp +++ b/GPU/Common/DepalettizeShaderCommon.cpp @@ -20,7 +20,6 @@ #include "Common/GPU/Shader.h" #include "Common/GPU/ShaderWriter.h" -#include "GPU/Common/ShaderCommon.h" #include "Common/StringUtils.h" #include "Common/Log.h" #include "Common/LogReporting.h" diff --git a/GPU/Common/DepthBufferCommon.cpp b/GPU/Common/DepthBufferCommon.cpp index 2f34d7519d..c6e5f655bd 100644 --- a/GPU/Common/DepthBufferCommon.cpp +++ b/GPU/Common/DepthBufferCommon.cpp @@ -19,7 +19,6 @@ #include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/LogReporting.h" -#include "Core/ConfigValues.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" diff --git a/GPU/Common/Draw2D.cpp b/GPU/Common/Draw2D.cpp index 927660252d..de997fa4ce 100644 --- a/GPU/Common/Draw2D.cpp +++ b/GPU/Common/Draw2D.cpp @@ -18,12 +18,9 @@ #include "Common/GPU/Shader.h" #include "Common/GPU/ShaderWriter.h" #include "Common/GPU/thin3d.h" -#include "Core/Config.h" -#include "Core/ConfigValues.h" #include "GPU/Common/Draw2D.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" -#include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/GPUStateUtils.h" static const InputDef inputs[2] = { diff --git a/GPU/Common/DrawEngineCommon.h b/GPU/Common/DrawEngineCommon.h index cdb7ee779f..0f8ab8a751 100644 --- a/GPU/Common/DrawEngineCommon.h +++ b/GPU/Common/DrawEngineCommon.h @@ -25,7 +25,6 @@ #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/Common/GPUStateUtils.h" -#include "GPU/Common/GPUDebugInterface.h" #include "GPU/Common/IndexGenerator.h" #include "GPU/Common/VertexDecoderCommon.h" diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index 63df710a4f..e919ba6113 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -23,15 +23,10 @@ #include "ext/imgui/imgui_impl_thin3d.h" #include "Common/GPU/thin3d.h" -#include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/Data/Collections/TinySet.h" #include "Common/Data/Convert/ColorConv.h" -#include "Common/Data/Text/I18n.h" #include "Common/LogReporting.h" -#include "Common/Math/lin/matrix4x4.h" -#include "Common/Math/math_util.h" #include "Common/System/Display.h" -#include "Common/System/OSD.h" #include "Common/VR/PPSSPPVR.h" #include "Common/CommonTypes.h" #include "Common/StringUtils.h" @@ -40,16 +35,11 @@ #include "Core/Core.h" #include "Core/CoreParameter.h" #include "Core/Debugger/MemBlockInfo.h" -#include "Core/MIPS/MIPS.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" -#include "GPU/Common/PostShader.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/ReinterpretFramebuffer.h" -#include "GPU/Debugger/Debugger.h" -#include "GPU/Debugger/Record.h" -#include "GPU/Debugger/Stepping.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" diff --git a/GPU/Common/GPUDebugInterface.cpp b/GPU/Common/GPUDebugInterface.cpp index 979445ceaa..3959107c25 100644 --- a/GPU/Common/GPUDebugInterface.cpp +++ b/GPU/Common/GPUDebugInterface.cpp @@ -21,7 +21,6 @@ #include "Core/Debugger/SymbolMap.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/GPUCommon.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Debugger/GECommandTable.h" #include "GPU/GPUState.h" diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp index 710264d958..776c9946ed 100644 --- a/GPU/Common/GPUStateUtils.cpp +++ b/GPU/Common/GPUStateUtils.cpp @@ -15,23 +15,18 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include +#include "ppsspp_config.h" #include -#include "Common/System/Display.h" - -#include "Common/StringUtils.h" -#include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" +#include "Core/Config.h" +#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Math3D.h" -#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" -#include "GPU/Common/ShaderId.h" -#include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/GPUStateUtils.h" @@ -1324,7 +1319,7 @@ static void ConvertBlendState(GenericBlendState &blendState, bool forceReplaceBl // Some Android devices (especially old Mali, it seems) composite badly if there's alpha in the backbuffer. // So in non-buffered rendering, we will simply consider the dest alpha to be zero in blending equations. -#ifdef __ANDROID__ +#if PPSSPP_PLATFORM(ANDROID) if (g_Config.bSkipBufferEffects) { if (glBlendFuncA == BlendFactor::DST_ALPHA) glBlendFuncA = BlendFactor::ZERO; if (glBlendFuncB == BlendFactor::DST_ALPHA) glBlendFuncB = BlendFactor::ZERO; diff --git a/GPU/Common/IndexGenerator.cpp b/GPU/Common/IndexGenerator.cpp index 3e9cb10a37..1094a70731 100644 --- a/GPU/Common/IndexGenerator.cpp +++ b/GPU/Common/IndexGenerator.cpp @@ -19,22 +19,8 @@ #include "ppsspp_config.h" -#include "Common/CPUDetect.h" #include "Common/Common.h" -#include "Common/Log.h" - -#ifdef _M_SSE -#include -#endif -#if PPSSPP_ARCH(ARM_NEON) - -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif - +#include "Common/Math/CrossSIMD.h" #include "GPU/Common/IndexGenerator.h" // Points don't need indexing... diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 97afc59bc9..9ea606078b 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -24,14 +24,12 @@ #include "Common/Log.h" #include "Common/Data/Format/IniFile.h" -#include "Common/File/FileUtil.h" #include "Common/File/DirListing.h" #include "Common/File/VFS/VFS.h" #include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/GPU/thin3d.h" #include "Common/StringUtils.h" -#include "Core/Config.h" #include "Core/System.h" #include "GPU/Common/PostShader.h" diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index 49f9b77f44..b9983ccf31 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "Common/GPU/thin3d.h" diff --git a/GPU/Common/ReinterpretFramebuffer.cpp b/GPU/Common/ReinterpretFramebuffer.cpp index 52d48d869a..d22108c966 100644 --- a/GPU/Common/ReinterpretFramebuffer.cpp +++ b/GPU/Common/ReinterpretFramebuffer.cpp @@ -4,10 +4,7 @@ #include "Common/GPU/ShaderWriter.h" #include "Common/Log.h" #include "Common/GPU/thin3d.h" -#include "Core/System.h" #include "GPU/Common/ReinterpretFramebuffer.h" -#include "GPU/Common/FramebufferManagerCommon.h" -#include "GPU/Common/TextureCacheCommon.h" static const VaryingDef varyings[1] = { { "vec2", "v_texcoord", Draw::SEM_TEXCOORD0, 0, "highp" }, diff --git a/GPU/Common/ReplacedTexture.cpp b/GPU/Common/ReplacedTexture.cpp index d735b68ff1..ba6bb34b2a 100644 --- a/GPU/Common/ReplacedTexture.cpp +++ b/GPU/Common/ReplacedTexture.cpp @@ -27,7 +27,6 @@ #include "GPU/Common/ReplacedTexture.h" #include "GPU/Common/TextureReplacer.h" -#include "Common/Data/Format/IniFile.h" #include "Common/Data/Format/DDSLoad.h" #include "Common/Data/Format/ZIMLoad.h" #include "Common/Data/Format/PNGLoad.h" diff --git a/GPU/Common/ShaderId.cpp b/GPU/Common/ShaderId.cpp index 67f6a687c7..bac29af015 100644 --- a/GPU/Common/ShaderId.cpp +++ b/GPU/Common/ShaderId.cpp @@ -4,7 +4,6 @@ #include "Common/GPU/thin3d.h" #include "Common/StringUtils.h" -#include "Core/System.h" #include "Core/Config.h" #include "GPU/ge_constants.h" diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index 7887a5e2a5..df9caba42a 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -15,20 +15,19 @@ // 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" #include "Common/Math/math_util.h" #include "Common/GPU/OpenGL/GLFeatures.h" #include "Core/Config.h" +#include "Core/System.h" #include "GPU/GPUState.h" #include "GPU/Math3D.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/SoftwareTransformCommon.h" #include "GPU/Common/TransformCommon.h" -#include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/DrawEngineCommon.h" diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp index 4c5e2ad948..11a7a25439 100644 --- a/GPU/Common/SplineCommon.cpp +++ b/GPU/Common/SplineCommon.cpp @@ -15,13 +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 "Common/Common.h" #include "Common/CPUDetect.h" #include "Common/Profiler/Profiler.h" -#include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/SplineCommon.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/SoftwareTransformCommon.h" diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 495b5c7bca..3a0b073a40 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -36,13 +36,9 @@ #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/TextureDecoder.h" -#include "GPU/Common/ShaderId.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/ge_constants.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Debugger/Record.h" -#include "GPU/GPUCommon.h" -#include "GPU/GPUCommon.h" #include "GPU/GPUState.h" #include "Core/Util/PPGeDraw.h" diff --git a/GPU/Common/TextureDecoder.cpp b/GPU/Common/TextureDecoder.cpp index dd96e98573..63c23c11b1 100644 --- a/GPU/Common/TextureDecoder.cpp +++ b/GPU/Common/TextureDecoder.cpp @@ -20,27 +20,13 @@ #include "ext/xxhash.h" #include "Common/Common.h" -#include "Common/Data/Convert/ColorConv.h" -#include "Common/CPUDetect.h" #include "Common/Log.h" #include "Common/Math/CrossSIMD.h" -#include "GPU/GPU.h" #include "GPU/GPUState.h" #include "GPU/Common/TextureDecoder.h" -#ifdef _M_SSE -#include -#include -#endif - -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif +#include "Common/Math/CrossSIMD.h" const u8 textureBitsPerPixel[16] = { 16, //GE_TFMT_5650, diff --git a/GPU/Common/TextureDecoder.h b/GPU/Common/TextureDecoder.h index 5f1d38aa2a..deb46ce9b9 100644 --- a/GPU/Common/TextureDecoder.h +++ b/GPU/Common/TextureDecoder.h @@ -19,7 +19,7 @@ #include "ppsspp_config.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Swap.h" #include "Core/MemMap.h" #include "GPU/ge_constants.h" diff --git a/GPU/Common/TextureReplacer.cpp b/GPU/Common/TextureReplacer.cpp index 7bd847e36e..c6c9aa7709 100644 --- a/GPU/Common/TextureReplacer.cpp +++ b/GPU/Common/TextureReplacer.cpp @@ -17,7 +17,6 @@ #include "ppsspp_config.h" -#include #include #include #include @@ -25,26 +24,19 @@ #include "ext/basis_universal/basisu_transcoder.h" #include "ext/xxhash.h" -#include "Common/Data/Convert/ColorConv.h" #include "Common/Data/Format/IniFile.h" -#include "Common/Data/Format/ZIMLoad.h" -#include "Common/Data/Format/PNGLoad.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Text/Parsers.h" #include "Common/File/VFS/DirectoryReader.h" #include "Common/File/VFS/ZipFileReader.h" #include "Common/File/FileUtil.h" #include "Common/File/VFS/VFS.h" -#include "Common/LogReporting.h" #include "Common/StringUtils.h" #include "Common/System/OSD.h" -#include "Common/Thread/ParallelLoop.h" -#include "Common/Thread/Waitable.h" #include "Common/Thread/ThreadManager.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/System.h" -#include "Core/ThreadPools.h" #include "Core/ELF/ParamSFO.h" #include "GPU/Common/TextureReplacer.h" #include "GPU/Common/TextureDecoder.h" diff --git a/GPU/Common/TextureScalerCommon.cpp b/GPU/Common/TextureScalerCommon.cpp index 939a9ab82b..246dbf6d66 100644 --- a/GPU/Common/TextureScalerCommon.cpp +++ b/GPU/Common/TextureScalerCommon.cpp @@ -16,8 +16,6 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include -#include #include #include @@ -26,16 +24,11 @@ #include "Core/Config.h" #include "Common/Common.h" #include "Common/Log.h" -#include "Common/CommonFuncs.h" #include "Common/Thread/ParallelLoop.h" -#include "Core/ThreadPools.h" -#include "Common/CPUDetect.h" #include "ext/xbrz/xbrz.h" -#if defined(_M_SSE) -#include -#include -#endif +#include "Common/Math/CrossSIMD.h" + // Report the time and throughput for each larger scaling operation in the log //#define SCALING_MEASURE_TIME diff --git a/GPU/Common/TextureShaderCommon.cpp b/GPU/Common/TextureShaderCommon.cpp index f17b29ea22..6dfd128d59 100644 --- a/GPU/Common/TextureShaderCommon.cpp +++ b/GPU/Common/TextureShaderCommon.cpp @@ -17,14 +17,12 @@ #include -#include "Common/Log.h" #include "Common/StringUtils.h" +#include "GPU/GPUState.h" #include "Common/GPU/Shader.h" #include "Common/GPU/ShaderWriter.h" #include "Common/Data/Convert/ColorConv.h" #include "GPU/Common/Draw2D.h" -#include "GPU/Common/DrawEngineCommon.h" -#include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/TextureShaderCommon.h" #include "GPU/Common/DepalettizeShaderCommon.h" diff --git a/GPU/Common/TransformCommon.cpp b/GPU/Common/TransformCommon.cpp index 7738430dc1..56b27a48b1 100644 --- a/GPU/Common/TransformCommon.cpp +++ b/GPU/Common/TransformCommon.cpp @@ -15,9 +15,8 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include - #include "Common/CPUDetect.h" +#include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Common/TransformCommon.h" diff --git a/GPU/Common/TransformCommon.h b/GPU/Common/TransformCommon.h index 9911bcff4a..de4a366f23 100644 --- a/GPU/Common/TransformCommon.h +++ b/GPU/Common/TransformCommon.h @@ -20,7 +20,6 @@ #include #include "Common/CommonTypes.h" -#include "GPU/ge_constants.h" #include "GPU/Math3D.h" #include "GPU/GPU.h" diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index ef26be2f96..633575fada 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -15,19 +15,14 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include - #include "ppsspp_config.h" #include "Common/CommonTypes.h" -#include "Common/CPUDetect.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Log.h" #include "Common/LogReporting.h" #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/MemMap.h" #include "Core/HDRemaster.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/Util/AudioFormat.h" // for clamp_u8 diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index 681f18c769..1860bf806b 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -3,18 +3,7 @@ #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/GPUState.h" -#ifdef _M_SSE -#include -#include -#endif - -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif +#include "Common/Math/CrossSIMD.h" // Candidates for hand-writing // (found using our custom Very Sleepy). diff --git a/GPU/Common/VertexShaderGenerator.cpp b/GPU/Common/VertexShaderGenerator.cpp index c5e83abb04..55d62b7acc 100644 --- a/GPU/Common/VertexShaderGenerator.cpp +++ b/GPU/Common/VertexShaderGenerator.cpp @@ -15,10 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include -#include - #include "Common/StringUtils.h" #include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/GPU/ShaderWriter.h" @@ -29,7 +25,6 @@ #include "GPU/GPUState.h" #include "GPU/Common/ShaderId.h" #include "GPU/Common/ShaderUniforms.h" -#include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/VertexShaderGenerator.h" #include "GPU/Vulkan/DrawEngineVulkan.h" diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp index d536d1e4c5..acc41fcb22 100644 --- a/GPU/D3D11/DrawEngineD3D11.cpp +++ b/GPU/D3D11/DrawEngineD3D11.cpp @@ -15,33 +15,23 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/Log.h" -#include "Common/MemoryUtil.h" -#include "Common/TimeUtil.h" #include "Common/Profiler/Profiler.h" -#include "Core/MemMap.h" -#include "Core/System.h" #include "Core/Config.h" -#include "Core/CoreTiming.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" -#include "GPU/Common/TextureDecoder.h" #include "GPU/Common/SplineCommon.h" #include "GPU/Common/TransformCommon.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/SoftwareTransformCommon.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/D3D11/FramebufferManagerD3D11.h" #include "GPU/D3D11/TextureCacheD3D11.h" #include "GPU/D3D11/DrawEngineD3D11.h" #include "GPU/D3D11/ShaderManagerD3D11.h" -#include "GPU/D3D11/GPU_D3D11.h" const D3D11_PRIMITIVE_TOPOLOGY d3d11prim[8] = { D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST, // Points are expanded to triangles. diff --git a/GPU/D3D11/DrawEngineD3D11.h b/GPU/D3D11/DrawEngineD3D11.h index 1b69736d13..690c2e9960 100644 --- a/GPU/D3D11/DrawEngineD3D11.h +++ b/GPU/D3D11/DrawEngineD3D11.h @@ -21,12 +21,8 @@ #include #include "Common/Data/Collections/Hashmaps.h" -#include "GPU/GPUState.h" -#include "GPU/Common/GPUDebugInterface.h" -#include "GPU/Common/IndexGenerator.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/DrawEngineCommon.h" -#include "GPU/Common/GPUStateUtils.h" #include "GPU/D3D11/StateMappingD3D11.h" #include "GPU/D3D11/D3D11Util.h" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 1c41a5a58b..496b51c2d0 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -18,20 +18,10 @@ #include #include "Common/Log.h" -#include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" -#include "Common/System/System.h" #include "Common/Profiler/Profiler.h" -#include "Common/Data/Text/I18n.h" -#include "Core/Debugger/Breakpoints.h" -#include "Core/MemMapHelpers.h" -#include "Core/MIPS/MIPS.h" -#include "Core/Config.h" -#include "Core/System.h" #include "GPU/GPUState.h" -#include "GPU/ge_constants.h" -#include "GPU/GeDisasm.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/D3D11/ShaderManagerD3D11.h" diff --git a/GPU/D3D11/ShaderManagerD3D11.cpp b/GPU/D3D11/ShaderManagerD3D11.cpp index 4cf6f87071..f6181ccc20 100644 --- a/GPU/D3D11/ShaderManagerD3D11.cpp +++ b/GPU/D3D11/ShaderManagerD3D11.cpp @@ -22,15 +22,9 @@ #include -#include "Common/Math/lin/matrix4x4.h" -#include "Common/Math/math_util.h" -#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/GPU/thin3d.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" #include "Common/CommonTypes.h" -#include "Core/Config.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/Common/VertexShaderGenerator.h" diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp index aff432ba42..ecafd09f06 100644 --- a/GPU/D3D11/StateMappingD3D11.cpp +++ b/GPU/D3D11/StateMappingD3D11.cpp @@ -18,16 +18,12 @@ #include #include -#include #include "Common/Data/Convert/SmallDataConvert.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/Common/GPUStateUtils.h" -#include "Core/System.h" -#include "Core/Config.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/D3D11/DrawEngineD3D11.h" diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp index 18d32180d3..a43e2d881b 100644 --- a/GPU/D3D11/TextureCacheD3D11.cpp +++ b/GPU/D3D11/TextureCacheD3D11.cpp @@ -21,23 +21,16 @@ #include -#include "Common/TimeUtil.h" -#include "Core/MemMap.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/D3D11/TextureCacheD3D11.h" #include "GPU/D3D11/FramebufferManagerD3D11.h" -#include "GPU/D3D11/ShaderManagerD3D11.h" -#include "GPU/Common/TextureShaderCommon.h" #include "GPU/D3D11/D3D11Util.h" -#include "GPU/Common/FramebufferManagerCommon.h" -#include "GPU/Common/TextureDecoder.h" #include "Core/Config.h" #include "ext/xxhash.h" -#include "Common/Math/math_util.h" // For depth depal struct DepthPushConstants { diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp index 84e3826df3..a0cd0c5733 100644 --- a/GPU/Directx9/DrawEngineDX9.cpp +++ b/GPU/Directx9/DrawEngineDX9.cpp @@ -19,16 +19,9 @@ #include #include "Common/Log.h" -#include "Common/MemoryUtil.h" -#include "Common/TimeUtil.h" -#include "Core/MemMap.h" -#include "Core/System.h" -#include "Core/Config.h" -#include "Core/CoreTiming.h" #include "Common/GPU/D3D9/D3D9StateCache.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" @@ -36,11 +29,10 @@ #include "GPU/Common/TransformCommon.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/SoftwareTransformCommon.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Directx9/TextureCacheDX9.h" #include "GPU/Directx9/DrawEngineDX9.h" #include "GPU/Directx9/ShaderManagerDX9.h" -#include "GPU/Directx9/GPU_DX9.h" +#include "GPU/Directx9/FramebufferManagerDX9.h" using Microsoft::WRL::ComPtr; diff --git a/GPU/Directx9/DrawEngineDX9.h b/GPU/Directx9/DrawEngineDX9.h index 9165955c6f..c31e960b4c 100644 --- a/GPU/Directx9/DrawEngineDX9.h +++ b/GPU/Directx9/DrawEngineDX9.h @@ -22,11 +22,7 @@ #include "Common/Data/Collections/Hashmaps.h" #include "GPU/GPUState.h" -#include "GPU/Common/GPUDebugInterface.h" -#include "GPU/Common/IndexGenerator.h" -#include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/DrawEngineCommon.h" -#include "GPU/Common/GPUStateUtils.h" #include "GPU/MiscTypes.h" struct DecVtxFormat; diff --git a/GPU/Directx9/FramebufferManagerDX9.cpp b/GPU/Directx9/FramebufferManagerDX9.cpp index 3a263a1d71..e03577e049 100644 --- a/GPU/Directx9/FramebufferManagerDX9.cpp +++ b/GPU/Directx9/FramebufferManagerDX9.cpp @@ -23,7 +23,6 @@ #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/PresentationCommon.h" -#include "GPU/Common/TextureDecoder.h" #include "GPU/Directx9/FramebufferManagerDX9.h" FramebufferManagerDX9::FramebufferManagerDX9(Draw::DrawContext *draw) diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 61f94384d3..2adf0c6222 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -22,18 +22,11 @@ #include "Common/System/OSD.h" #include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" -#include "Core/Debugger/Breakpoints.h" -#include "Core/MemMapHelpers.h" -#include "Core/MIPS/MIPS.h" #include "Core/Config.h" -#include "Core/ConfigValues.h" -#include "Core/System.h" #include "Common/GPU/D3D9/D3D9StateCache.h" #include "GPU/GPUState.h" -#include "GPU/ge_constants.h" -#include "GPU/GeDisasm.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Directx9/ShaderManagerDX9.h" diff --git a/GPU/Directx9/GPU_DX9.h b/GPU/Directx9/GPU_DX9.h index 78468a0169..5b675ae481 100644 --- a/GPU/Directx9/GPU_DX9.h +++ b/GPU/Directx9/GPU_DX9.h @@ -20,8 +20,8 @@ #include #include +#include "Common/GPU/thin3d.h" #include "GPU/GPUCommonHW.h" -#include "GPU/Directx9/FramebufferManagerDX9.h" #include "GPU/Directx9/DrawEngineDX9.h" #include "GPU/Common/TextureShaderCommon.h" #include "GPU/Common/VertexDecoderCommon.h" @@ -29,6 +29,7 @@ class ShaderManagerDX9; class LinkedShaderDX9; class TextureCacheDX9; +class FramebufferManagerDX9; class GPU_DX9 : public GPUCommonHW { public: diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index f2cc6a6c4c..93f8408f50 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -18,31 +18,20 @@ #include #include "Common/LogReporting.h" -#include "Common/MemoryUtil.h" -#include "Common/TimeUtil.h" -#include "Core/MemMap.h" -#include "Core/System.h" -#include "Core/Config.h" -#include "Core/CoreTiming.h" #include "Common/GPU/OpenGL/GLDebugLog.h" #include "Common/Profiler/Profiler.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" -#include "GPU/Common/TextureDecoder.h" #include "GPU/Common/SplineCommon.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/SoftwareTransformCommon.h" -#include "GPU/Debugger/Debugger.h" -#include "GPU/GLES/FragmentTestCacheGLES.h" -#include "GPU/GLES/StateMappingGLES.h" -#include "GPU/GLES/TextureCacheGLES.h" #include "GPU/GLES/DrawEngineGLES.h" #include "GPU/GLES/ShaderManagerGLES.h" #include "GPU/GLES/GPU_GLES.h" +#include "GPU/GLES/FramebufferManagerGLES.h" static const GLuint glprim[8] = { // Points, which are expanded to triangles. diff --git a/GPU/GLES/FragmentTestCacheGLES.cpp b/GPU/GLES/FragmentTestCacheGLES.cpp index 45a4116c0e..b1443b01a5 100644 --- a/GPU/GLES/FragmentTestCacheGLES.cpp +++ b/GPU/GLES/FragmentTestCacheGLES.cpp @@ -17,11 +17,9 @@ #include "Common/GPU/thin3d.h" #include "Common/GPU/OpenGL/GLDebugLog.h" -#include "Core/Config.h" #include "GPU/GLES/FragmentTestCacheGLES.h" #include "GPU/GPUState.h" #include "GPU/Common/GPUStateUtils.h" -#include "GPU/Common/ShaderId.h" // These are small, let's give them plenty of frames. static const int FRAGTEST_TEXTURE_OLD_AGE = 307; diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index 0c2851e267..7e9d040924 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -21,7 +21,6 @@ #include "Core/System.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" -#include "GPU/Common/TextureDecoder.h" #include "GPU/GLES/FramebufferManagerGLES.h" FramebufferManagerGLES::FramebufferManagerGLES(Draw::DrawContext *draw) : diff --git a/GPU/GLES/GPU_GLES.h b/GPU/GLES/GPU_GLES.h index d05b85819b..6e83b01d2b 100644 --- a/GPU/GLES/GPU_GLES.h +++ b/GPU/GLES/GPU_GLES.h @@ -18,18 +18,17 @@ #pragma once #include -#include #include "Common/File/Path.h" #include "GPU/GPUCommonHW.h" #include "GPU/Common/TextureShaderCommon.h" -#include "GPU/GLES/FramebufferManagerGLES.h" #include "GPU/GLES/DrawEngineGLES.h" #include "GPU/GLES/FragmentTestCacheGLES.h" class ShaderManagerGLES; class TextureCacheGLES; +class FramebufferManagerGLES; class LinkedShader; class GPU_GLES : public GPUCommonHW { diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index c3e0316b02..de60daa495 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -42,14 +42,12 @@ #include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Core/Config.h" -#include "Core/System.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/Common/ShaderUniforms.h" #include "GPU/GLES/ShaderManagerGLES.h" #include "GPU/GLES/DrawEngineGLES.h" -#include "GPU/GLES/FramebufferManagerGLES.h" using namespace Lin; diff --git a/GPU/GLES/ShaderManagerGLES.h b/GPU/GLES/ShaderManagerGLES.h index 063c7d012b..0322863907 100644 --- a/GPU/GLES/ShaderManagerGLES.h +++ b/GPU/GLES/ShaderManagerGLES.h @@ -21,7 +21,6 @@ #include "Common/Data/Collections/Hashmaps.h" #include "Common/GPU/OpenGL/GLRenderManager.h" -#include "Common/File/Path.h" #include "GPU/Common/ShaderCommon.h" #include "GPU/Common/ShaderId.h" #include "GPU/Common/VertexShaderGenerator.h" @@ -29,6 +28,7 @@ class DrawEngineGLES; class Shader; +class Path; struct ShaderLanguageDesc; namespace File { diff --git a/GPU/GLES/StateMappingGLES.cpp b/GPU/GLES/StateMappingGLES.cpp index 7a846711f3..dbd920d091 100644 --- a/GPU/GLES/StateMappingGLES.cpp +++ b/GPU/GLES/StateMappingGLES.cpp @@ -20,22 +20,16 @@ // https://github.com/hrydgard/ppsspp/issues/3768 #include "ppsspp_config.h" -#include "StateMappingGLES.h" +#include "GPU/GLES/StateMappingGLES.h" #include "Common/Profiler/Profiler.h" #include "Common/GPU/OpenGL/GLDebugLog.h" #include "Common/GPU/OpenGL/GLRenderManager.h" #include "Common/Data/Convert/SmallDataConvert.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" -#include "Core/System.h" -#include "Core/Config.h" #include "GPU/GLES/GPU_GLES.h" -#include "GPU/GLES/ShaderManagerGLES.h" -#include "GPU/GLES/TextureCacheGLES.h" #include "GPU/GLES/FramebufferManagerGLES.h" -#include "GPU/Common/FragmentShaderGenerator.h" static const GLushort glBlendFactorLookup[(size_t)BlendFactor::COUNT] = { GL_ZERO, diff --git a/GPU/GLES/StencilBufferGLES.cpp b/GPU/GLES/StencilBufferGLES.cpp index 688e12299a..441aa8bad2 100644 --- a/GPU/GLES/StencilBufferGLES.cpp +++ b/GPU/GLES/StencilBufferGLES.cpp @@ -19,8 +19,6 @@ #include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/LogReporting.h" -#include "Core/ConfigValues.h" -#include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/GLES/FramebufferManagerGLES.h" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index 2057d251ca..90df708b41 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -15,30 +15,23 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include #include "ext/xxhash.h" #include "Common/Common.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Data/Text/I18n.h" -#include "Common/Math/math_util.h" #include "Common/Profiler/Profiler.h" #include "Common/System/OSD.h" #include "Common/GPU/OpenGL/GLRenderManager.h" #include "Common/TimeUtil.h" -#include "Core/Config.h" -#include "Core/MemMap.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/GLES/TextureCacheGLES.h" #include "GPU/GLES/FramebufferManagerGLES.h" -#include "GPU/Common/FragmentShaderGenerator.h" #include "GPU/Common/TextureShaderCommon.h" -#include "GPU/GLES/ShaderManagerGLES.h" -#include "GPU/GLES/DrawEngineGLES.h" -#include "GPU/Common/TextureDecoder.h" +#include "GPU/Common/DrawEngineCommon.h" #ifdef _M_SSE #include diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 9e988004de..fdf5abfe2b 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -1,22 +1,10 @@ #include "ppsspp_config.h" -#if defined(_M_SSE) -#include -#endif -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif - -#include - #include "Common/Profiler/Profiler.h" #include "Common/GraphicsContext.h" #include "Common/LogReporting.h" +#include "Common/Math/CrossSIMD.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeList.h" @@ -36,7 +24,6 @@ #include "Core/HLE/sceKernelInterrupt.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceGe.h" -#include "Core/HW/Display.h" #include "Core/Util/PPGeDraw.h" #include "Core/MemMapHelpers.h" #include "GPU/Common/DrawEngineCommon.h" diff --git a/GPU/GPUCommonHW.cpp b/GPU/GPUCommonHW.cpp index a6e2d80755..9b5389c875 100644 --- a/GPU/GPUCommonHW.cpp +++ b/GPU/GPUCommonHW.cpp @@ -13,7 +13,6 @@ #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" -#include "GPU/Debugger/Debugger.h" struct CommonCommandTableEntry { uint8_t cmd; diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp index 201d35b99c..8c0ba853ea 100644 --- a/GPU/GPUState.cpp +++ b/GPU/GPUState.cpp @@ -19,24 +19,11 @@ #include "Common/Common.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Core/CoreParameter.h" -#include "Core/Config.h" -#include "Core/System.h" #include "Core/MemMap.h" #include "GPU/ge_constants.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" - -#ifdef _M_SSE -#include -#endif -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif +#include "Common/Math/CrossSIMD.h" // This must be aligned so that the matrices within are aligned. alignas(16) GPUgstate gstate; diff --git a/GPU/Vulkan/DebugVisVulkan.cpp b/GPU/Vulkan/DebugVisVulkan.cpp index b37cbadbd3..04793dcda3 100644 --- a/GPU/Vulkan/DebugVisVulkan.cpp +++ b/GPU/Vulkan/DebugVisVulkan.cpp @@ -23,8 +23,6 @@ #include "Common/GPU/thin3d.h" #include "Common/GPU/Vulkan/VulkanContext.h" #include "Common/UI/Context.h" -#include "Common/UI/View.h" -#include "Common/System/Display.h" #include "Common/System/System.h" #include "ext/vma/vk_mem_alloc.h" @@ -32,9 +30,7 @@ #include "DebugVisVulkan.h" #include "Common/GPU/GPUBackendCommon.h" #include "Common/GPU/Vulkan/VulkanMemory.h" -#include "Common/GPU/Vulkan/VulkanImage.h" #include "Common/Data/Text/Parsers.h" -#include "GPU/Vulkan/GPU_Vulkan.h" #include "GPU/Vulkan/VulkanUtil.h" #include "GPU/Vulkan/TextureCacheVulkan.h" diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 8500ee5d9e..f1279b855a 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -16,22 +16,13 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" -#include #include -#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Profiler/Profiler.h" #include "Common/GPU/Vulkan/VulkanRenderManager.h" #include "Common/Log.h" -#include "Common/MemoryUtil.h" -#include "Common/TimeUtil.h" -#include "Core/MemMap.h" -#include "Core/System.h" -#include "Core/Config.h" -#include "Core/CoreTiming.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" @@ -44,13 +35,11 @@ #include "GPU/Common/SoftwareTransformCommon.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/ShaderUniforms.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Vulkan/DrawEngineVulkan.h" #include "GPU/Vulkan/TextureCacheVulkan.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" #include "GPU/Vulkan/PipelineManagerVulkan.h" #include "GPU/Vulkan/FramebufferManagerVulkan.h" -#include "GPU/Vulkan/GPU_Vulkan.h" using namespace PPSSPP_VK; diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index 0cc7c5c9ac..b1d17eb747 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -15,12 +15,8 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "GPU/GPUState.h" #include "GPU/Vulkan/FramebufferManagerVulkan.h" -#include "GPU/Vulkan/VulkanUtil.h" - -using namespace PPSSPP_VK; FramebufferManagerVulkan::FramebufferManagerVulkan(Draw::DrawContext *draw) : FramebufferManagerCommon(draw) { diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 460e28387c..f3e5a0b2df 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -23,20 +23,13 @@ #include "Common/Log.h" #include "Common/File/FileUtil.h" #include "Common/GraphicsContext.h" -#include "Common/Serialize/Serializer.h" -#include "Common/TimeUtil.h" -#include "Common/Thread/ThreadUtil.h" #include "Core/Config.h" -#include "Core/Debugger/Breakpoints.h" -#include "Core/MemMapHelpers.h" #include "Core/Reporting.h" #include "Core/System.h" #include "Core/ELF/ParamSFO.h" #include "GPU/GPUState.h" -#include "GPU/ge_constants.h" -#include "GPU/GeDisasm.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" #include "GPU/Vulkan/GPU_Vulkan.h" diff --git a/GPU/Vulkan/PipelineManagerVulkan.cpp b/GPU/Vulkan/PipelineManagerVulkan.cpp index 9babb43e39..06cbcc83c6 100644 --- a/GPU/Vulkan/PipelineManagerVulkan.cpp +++ b/GPU/Vulkan/PipelineManagerVulkan.cpp @@ -8,11 +8,8 @@ #include "Common/Log.h" #include "Common/StringUtils.h" #include "Common/GPU/Vulkan/VulkanContext.h" -#include "Core/Config.h" -#include "GPU/Vulkan/VulkanUtil.h" #include "GPU/Vulkan/PipelineManagerVulkan.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" -#include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/ShaderId.h" #include "Common/GPU/thin3d.h" #include "Common/GPU/Vulkan/VulkanRenderManager.h" diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index d6e6b4a144..df9b310359 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -20,30 +20,19 @@ #endif #include "Common/LogReporting.h" -#include "Common/Math/lin/matrix4x4.h" -#include "Common/Math/math_util.h" -#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Profiler/Profiler.h" #include "Common/GPU/thin3d.h" -#include "Common/Data/Encoding/Utf8.h" -#include "Common/TimeUtil.h" #include "Common/MemoryUtil.h" #include "Common/StringUtils.h" #include "Common/GPU/Vulkan/VulkanContext.h" -#include "Common/GPU/Vulkan/VulkanMemory.h" #include "Common/Log.h" -#include "Common/CommonTypes.h" -#include "Core/Config.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" -#include "GPU/ge_constants.h" #include "GPU/Common/FragmentShaderGenerator.h" #include "GPU/Common/VertexShaderGenerator.h" #include "GPU/Common/GeometryShaderGenerator.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" #include "GPU/Vulkan/DrawEngineVulkan.h" -#include "GPU/Vulkan/FramebufferManagerVulkan.h" // Most drivers treat vkCreateShaderModule as pretty much a memcpy. What actually // takes time here, and makes this worthy of parallelization, is GLSLtoSPV. diff --git a/GPU/Vulkan/StateMappingVulkan.cpp b/GPU/Vulkan/StateMappingVulkan.cpp index 8ed78f9d86..ae5f3be0d2 100644 --- a/GPU/Vulkan/StateMappingVulkan.cpp +++ b/GPU/Vulkan/StateMappingVulkan.cpp @@ -20,15 +20,10 @@ #include "Common/GPU/Vulkan/VulkanLoader.h" #include "Common/GPU/Vulkan/VulkanRenderManager.h" -#include "Common/Data/Convert/SmallDataConvert.h" -#include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/Common/GPUStateUtils.h" -#include "Core/System.h" #include "Core/Config.h" -#include "GPU/Vulkan/GPU_Vulkan.h" -#include "GPU/Vulkan/PipelineManagerVulkan.h" #include "GPU/Vulkan/FramebufferManagerVulkan.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" #include "GPU/Vulkan/DrawEngineVulkan.h" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 1520358cad..74ee0f3385 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -28,7 +28,6 @@ #include "Common/GPU/thin3d.h" #include "Common/GPU/Vulkan/VulkanRenderManager.h" #include "Common/System/OSD.h" -#include "Common/Data/Convert/ColorConv.h" #include "Common/StringUtils.h" #include "Common/TimeUtil.h" #include "Common/GPU/Vulkan/VulkanContext.h" @@ -36,8 +35,6 @@ #include "Common/GPU/Vulkan/VulkanMemory.h" #include "Core/Config.h" -#include "Core/MemMap.h" -#include "Core/System.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" diff --git a/GPU/Vulkan/VulkanUtil.cpp b/GPU/Vulkan/VulkanUtil.cpp index dcde43d286..fa5fb9de35 100644 --- a/GPU/Vulkan/VulkanUtil.cpp +++ b/GPU/Vulkan/VulkanUtil.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/Log.h" #include "Common/StringUtils.h" #include "Common/GPU/Vulkan/VulkanContext.h"