From 9e41fafd0d7fd2d8b90c592faacb76f4eeb995cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 00:25:21 +0200 Subject: [PATCH 1/7] Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes --- CMakeLists.txt | 59 +++---- Common/Common.vcxproj | 36 ++++- Common/Common.vcxproj.filters | 121 ++++++++++++++- Common/CommonTypes.h | 8 - .../Data/Convert/SmallDataConvert.cpp | 2 +- .../Data/Convert/SmallDataConvert.h | 0 .../Data/Format/IniFile.cpp | 4 +- .../Data/Format/IniFile.h | 0 .../Data/Format/RIFF.cpp | 5 +- .../chunk_file.h => Common/Data/Format/RIFF.h | 2 +- Common/Data/Text/I18n.cpp | 4 +- .../file/free.cpp => Common/File/DiskFree.cpp | 0 .../file/free.h => Common/File/DiskFree.h | 0 .../path.cpp => Common/File/PathBrowser.cpp | 8 +- .../file/path.h => Common/File/PathBrowser.h | 4 +- .../File/VFS/AssetReader.cpp | 146 +----------------- .../File/VFS/AssetReader.h | 2 +- Common/File/VFS/VFS.cpp | 118 ++++++++++++++ .../file/vfs.h => Common/File/VFS/VFS.h | 0 Common/FileUtil.h | 1 + Common/Input/GestureDetector.h | 2 +- Common/Input/InputState.h | 2 +- Common/LogManager.h | 2 +- {ext/native/math => Common/Math}/curves.cpp | 2 +- {ext/native/math => Common/Math}/curves.h | 0 .../Math}/expression_parser.cpp | 24 +-- .../math => Common/Math}/expression_parser.h | 0 .../math => Common/Math}/fast/fast_math.c | 0 .../math => Common/Math}/fast/fast_math.h | 0 .../math => Common/Math}/fast/fast_matrix.c | 0 .../math => Common/Math}/fast/fast_matrix.h | 0 .../Math}/fast/fast_matrix_neon.S | 0 .../Math}/fast/fast_matrix_sse.c | 0 {ext/native/math => Common/Math}/geom2d.h | 0 .../math => Common/Math}/lin/matrix4x4.cpp | 6 +- .../math => Common/Math}/lin/matrix4x4.h | 2 +- .../math => Common/Math}/lin/matrix_neon.s | 0 {ext/native/math => Common/Math}/lin/vec3.cpp | 4 +- {ext/native/math => Common/Math}/lin/vec3.h | 0 .../native/math => Common/Math}/math_util.cpp | 2 +- {ext/native/math => Common/Math}/math_util.h | 0 Common/Vulkan/VulkanMemory.cpp | 2 +- Core/Compatibility.cpp | 3 +- Core/Config.cpp | 4 +- Core/Core.vcxproj | 2 + Core/Core.vcxproj.filters | 6 + Core/Debugger/DebugInterface.h | 2 +- Core/Dialog/PSPOskDialog.cpp | 2 +- Core/FileLoaders/DiskCachingFileLoader.cpp | 2 +- Core/FileSystems/DirectoryFileSystem.cpp | 4 +- Core/FileSystems/VirtualDiscFileSystem.cpp | 1 - Core/HLE/Plugins.cpp | 2 +- Core/HLE/sceJpeg.cpp | 12 +- Core/HLE/sceUtility.cpp | 2 +- {Common => Core}/KeyMap.cpp | 4 +- {Common => Core}/KeyMap.h | 0 Core/MIPS/ARM/ArmCompVFPU.cpp | 2 +- Core/MIPS/ARM/ArmCompVFPUNEON.cpp | 2 +- Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp | 2 +- Core/MIPS/ARM64/Arm64CompVFPU.cpp | 2 +- Core/MIPS/IR/IRCompVFPU.cpp | 2 +- Core/MIPS/IR/IRInterpreter.cpp | 2 +- Core/MIPS/MIPS.cpp | 2 +- Core/MIPS/MIPSInt.cpp | 2 +- Core/MIPS/MIPSIntVFPU.cpp | 2 +- Core/MIPS/x86/Asm.cpp | 2 +- Core/MIPS/x86/CompVFPU.cpp | 2 +- Core/MIPS/x86/Jit.cpp | 2 +- Core/Reporting.cpp | 5 +- Core/System.cpp | 2 +- Core/TextureReplacer.cpp | 2 +- Core/Util/GameManager.cpp | 2 +- Core/Util/PPGeDraw.cpp | 2 +- GPU/Common/PostShader.cpp | 4 +- GPU/Common/PostShader.h | 2 +- GPU/Common/PresentationCommon.cpp | 4 +- GPU/Common/ShaderUniforms.cpp | 8 +- GPU/Common/SoftwareTransformCommon.cpp | 2 +- GPU/D3D11/FramebufferManagerD3D11.cpp | 2 +- GPU/D3D11/ShaderManagerD3D11.cpp | 6 +- GPU/D3D11/StateMappingD3D11.cpp | 2 +- GPU/D3D11/TextureCacheD3D11.cpp | 2 +- GPU/Directx9/FramebufferManagerDX9.cpp | 2 +- GPU/Directx9/ShaderManagerDX9.cpp | 6 +- GPU/Directx9/ShaderManagerDX9.h | 2 +- GPU/Directx9/TextureCacheDX9.cpp | 2 +- GPU/GLES/ShaderManagerGLES.cpp | 6 +- GPU/GLES/TextureCacheGLES.cpp | 2 +- GPU/Math3D.h | 2 +- GPU/Software/TransformUnit.cpp | 2 +- GPU/Vulkan/DrawEngineVulkan.cpp | 2 +- GPU/Vulkan/FramebufferManagerVulkan.cpp | 4 +- GPU/Vulkan/ShaderManagerVulkan.cpp | 6 +- GPU/Vulkan/ShaderManagerVulkan.h | 2 +- GPU/Vulkan/StateMappingVulkan.cpp | 2 +- GPU/Vulkan/TextureCacheVulkan.cpp | 4 +- Qt/QtMain.cpp | 2 +- SDL/SDLJoystick.cpp | 2 +- SDL/SDLMain.cpp | 2 +- UI/BackgroundAudio.cpp | 4 +- UI/ComboKeyMappingScreen.cpp | 8 +- UI/ControlMappingScreen.cpp | 2 +- UI/EmuScreen.cpp | 4 +- UI/EmuScreen.h | 2 +- UI/GameInfoCache.cpp | 3 +- UI/GameSettingsScreen.cpp | 4 +- UI/GamepadEmu.cpp | 2 +- UI/MainScreen.cpp | 5 +- UI/MainScreen.h | 2 +- UI/MiscScreens.cpp | 4 +- UI/NativeApp.cpp | 14 +- UI/OnScreenDisplay.h | 2 +- UI/RemoteISOScreen.cpp | 2 +- UI/SavedataScreen.cpp | 2 +- UI/TextureUtil.cpp | 6 +- UI/TouchControlLayoutScreen.cpp | 2 +- UWP/CommonUWP/CommonUWP.vcxproj | 36 ++++- UWP/CommonUWP/CommonUWP.vcxproj.filters | 121 ++++++++++++++- UWP/CoreUWP/CoreUWP.vcxproj | 2 + UWP/CoreUWP/CoreUWP.vcxproj.filters | 2 + UWP/NativeUWP/NativeUWP.vcxproj | 143 +---------------- UWP/NativeUWP/NativeUWP.vcxproj.filters | 101 +----------- UWP/PPSSPP_UWPMain.cpp | 10 +- Windows/GEDebugger/SimpleGLWindow.cpp | 2 +- Windows/GEDebugger/VertexPreview.cpp | 2 +- Windows/MainWindow.cpp | 2 +- Windows/MainWindowMenu.cpp | 1 + Windows/MainWindowMenu.h | 1 - Windows/TouchInputHandler.cpp | 2 + Windows/XinputDevice.cpp | 2 +- Windows/main.cpp | 4 +- android/jni/Android.mk | 42 ++--- android/jni/app-android.cpp | 5 +- ext/native/base/display.cpp | 2 +- ext/native/base/display.h | 2 +- ext/native/file/file_util.cpp | 28 ++++ ext/native/file/file_util.h | 6 +- ext/native/gfx_es2/draw_buffer.cpp | 2 +- ext/native/gfx_es2/draw_buffer.h | 4 +- ext/native/gfx_es2/glsl_program.cpp | 4 +- ext/native/image/zim_load.cpp | 4 +- ext/native/json/json_reader.cpp | 3 +- ext/native/native.vcxproj | 34 ---- ext/native/native.vcxproj.filters | 96 ------------ ext/native/thin3d/GLQueueRunner.cpp | 4 +- ext/native/thin3d/GLRenderManager.h | 2 +- ext/native/thin3d/VulkanQueueRunner.h | 2 +- ext/native/thin3d/VulkanRenderManager.h | 4 +- ext/native/thin3d/thin3d_d3d11.cpp | 2 +- ext/native/thin3d/thin3d_d3d9.cpp | 2 +- ext/native/thin3d/thin3d_gl.cpp | 6 +- ext/native/thin3d/thin3d_vulkan.cpp | 4 +- ext/native/ui/ui_context.h | 4 +- ext/native/ui/ui_screen.cpp | 2 +- ext/native/ui/ui_screen.h | 2 +- ext/native/ui/view.h | 6 +- ext/native/ui/viewgroup.cpp | 2 +- ext/native/ui/viewgroup.h | 2 +- headless/SDLHeadlessHost.cpp | 2 +- headless/WindowsHeadlessHost.cpp | 4 +- libretro/Makefile.common | 13 +- libretro/libretro.cpp | 2 +- 162 files changed, 739 insertions(+), 790 deletions(-) rename ext/native/math/dataconv.cpp => Common/Data/Convert/SmallDataConvert.cpp (68%) rename ext/native/math/dataconv.h => Common/Data/Convert/SmallDataConvert.h (100%) rename ext/native/file/ini_file.cpp => Common/Data/Format/IniFile.cpp (99%) rename ext/native/file/ini_file.h => Common/Data/Format/IniFile.h (100%) rename ext/native/file/chunk_file.cpp => Common/Data/Format/RIFF.cpp (96%) rename ext/native/file/chunk_file.h => Common/Data/Format/RIFF.h (94%) rename ext/native/file/free.cpp => Common/File/DiskFree.cpp (100%) rename ext/native/file/free.h => Common/File/DiskFree.h (100%) rename ext/native/file/path.cpp => Common/File/PathBrowser.cpp (99%) rename ext/native/file/path.h => Common/File/PathBrowser.h (93%) rename ext/native/file/zip_read.cpp => Common/File/VFS/AssetReader.cpp (60%) rename ext/native/file/zip_read.h => Common/File/VFS/AssetReader.h (98%) create mode 100644 Common/File/VFS/VFS.cpp rename ext/native/file/vfs.h => Common/File/VFS/VFS.h (100%) rename {ext/native/math => Common/Math}/curves.cpp (98%) rename {ext/native/math => Common/Math}/curves.h (100%) rename {ext/native/math => Common/Math}/expression_parser.cpp (92%) rename {ext/native/math => Common/Math}/expression_parser.h (100%) rename {ext/native/math => Common/Math}/fast/fast_math.c (100%) rename {ext/native/math => Common/Math}/fast/fast_math.h (100%) rename {ext/native/math => Common/Math}/fast/fast_matrix.c (100%) rename {ext/native/math => Common/Math}/fast/fast_matrix.h (100%) rename {ext/native/math => Common/Math}/fast/fast_matrix_neon.S (100%) rename {ext/native/math => Common/Math}/fast/fast_matrix_sse.c (100%) rename {ext/native/math => Common/Math}/geom2d.h (100%) rename {ext/native/math => Common/Math}/lin/matrix4x4.cpp (95%) rename {ext/native/math => Common/Math}/lin/matrix4x4.h (98%) rename {ext/native/math => Common/Math}/lin/matrix_neon.s (100%) rename {ext/native/math => Common/Math}/lin/vec3.cpp (83%) rename {ext/native/math => Common/Math}/lin/vec3.h (100%) rename {ext/native/math => Common/Math}/math_util.cpp (96%) rename {ext/native/math => Common/Math}/math_util.h (100%) rename {Common => Core}/KeyMap.cpp (99%) rename {Common => Core}/KeyMap.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index acbbbe43ac..6bafe8c74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -437,6 +437,8 @@ add_library(Common STATIC Common/Data/Collections/TinySet.h Common/Data/Color/RGBAUtil.cpp Common/Data/Color/RGBAUtil.h + Common/Data/Convert/SmallDataConvert.cpp + Common/Data/Convert/SmallDataConvert.h Common/Data/Encoding/Base64.cpp Common/Data/Encoding/Base64.h Common/Data/Encoding/Compression.cpp @@ -445,6 +447,10 @@ add_library(Common STATIC Common/Data/Encoding/Utf8.cpp Common/Data/Encoding/Utf8.h Common/Data/Encoding/Utf16.h + Common/Data/Format/RIFF.cpp + Common/Data/Format/RIFF.h + Common/Data/Format/IniFile.cpp + Common/Data/Format/IniFile.h Common/Data/Hash/Hash.cpp Common/Data/Hash/Hash.h Common/Data/Text/I18n.cpp @@ -454,11 +460,33 @@ add_library(Common STATIC Common/Data/Text/WrapText.cpp Common/Data/Text/WrapText.h Common/Data/Random/Rng.h + Common/File/VFS/VFS.h + Common/File/VFS/VFS.cpp + Common/File/VFS/AssetReader.cpp + Common/File/VFS/AssetReader.h + Common/File/DiskFree.h + Common/File/DiskFree.cpp + Common/File/PathBrowser.h + Common/File/PathBrowser.cpp Common/Input/GestureDetector.cpp Common/Input/GestureDetector.h Common/Input/KeyCodes.h Common/Input/InputState.cpp Common/Input/InputState.h + Common/Math/fast/fast_math.c + Common/Math/fast/fast_matrix.c + Common/Math/fast/fast_matrix_neon.S + Common/Math/fast/fast_matrix_sse.c + Common/Math/curves.cpp + Common/Math/curves.h + Common/Math/expression_parser.cpp + Common/Math/expression_parser.h + Common/Math/lin/matrix4x4.cpp + Common/Math/lin/matrix4x4.h + Common/Math/lin/vec3.cpp + Common/Math/lin/vec3.h + Common/Math/math_util.cpp + Common/Math/math_util.h Common/Thread/Executor.cpp Common/Thread/Executor.h Common/Thread/PrioritizedWorkQueue.cpp @@ -486,8 +514,6 @@ add_library(Common STATIC Common/ExceptionHandlerSetup.h Common/FileUtil.cpp Common/FileUtil.h - Common/KeyMap.cpp - Common/KeyMap.h Common/Hashmaps.h Common/Log.h Common/Log.cpp @@ -980,21 +1006,10 @@ add_library(native STATIC ${nativeExtra} ext/native/base/display.cpp ext/native/base/display.h - ext/native/file/chunk_file.cpp - ext/native/file/chunk_file.h ext/native/file/fd_util.cpp ext/native/file/fd_util.h ext/native/file/file_util.cpp ext/native/file/file_util.h - ext/native/file/free.cpp - ext/native/file/free.h - ext/native/file/ini_file.cpp - ext/native/file/ini_file.h - ext/native/file/path.cpp - ext/native/file/path.h - ext/native/file/vfs.h - ext/native/file/zip_read.cpp - ext/native/file/zip_read.h ext/native/gfx/gl_common.h ext/native/gfx/gl_debug_log.cpp ext/native/gfx/gl_debug_log.h @@ -1030,22 +1045,6 @@ add_library(native STATIC ext/native/json/json_reader.cpp ext/native/json/json_writer.h ext/native/json/json_writer.cpp - ext/native/math/fast/fast_math.c - ext/native/math/fast/fast_matrix.c - ext/native/math/fast/fast_matrix_neon.S - ext/native/math/fast/fast_matrix_sse.c - ext/native/math/dataconv.cpp - ext/native/math/dataconv.h - ext/native/math/curves.cpp - ext/native/math/curves.h - ext/native/math/expression_parser.cpp - ext/native/math/expression_parser.h - ext/native/math/lin/matrix4x4.cpp - ext/native/math/lin/matrix4x4.h - ext/native/math/lin/vec3.cpp - ext/native/math/lin/vec3.h - ext/native/math/math_util.cpp - ext/native/math/math_util.h ext/native/net/http_client.cpp ext/native/net/http_client.h ext/native/net/http_headers.cpp @@ -1465,6 +1464,8 @@ add_library(${CoreLibName} ${CoreLinkType} Core/HDRemaster.h Core/Instance.cpp Core/Instance.h + Core/KeyMap.cpp + Core/KeyMap.h Core/ThreadEventQueue.h Core/WebServer.cpp Core/WebServer.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 5a4aef7e51..d914911c40 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -362,20 +362,35 @@ + + + + + + + + + + + + + + + @@ -420,7 +435,6 @@ - @@ -628,16 +642,31 @@ false + + + + + + + + + + + + + + + @@ -677,7 +706,6 @@ true true - @@ -712,6 +740,10 @@ {f761046e-6c38-4428-a5f1-38391a37bb34} + + + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 6408cd9512..ae66327176 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -23,7 +23,6 @@ Crypto - @@ -176,6 +175,51 @@ Data\Color + + Data\Convert + + + Math + + + Math + + + Math + + + Math + + + Math\lin + + + Math\lin + + + Math\fast + + + Math\fast + + + Data\Format + + + File + + + File + + + File\VFS + + + File\VFS + + + Data\Format + @@ -195,7 +239,6 @@ Crypto - Crypto @@ -333,6 +376,51 @@ Data\Color + + Data\Convert + + + Math + + + Math + + + Math + + + Math\lin + + + Math\lin + + + Math\fast + + + Math\fast + + + Math\fast + + + Data\Format + + + File + + + File + + + File\VFS + + + File\VFS + + + Data\Format + @@ -383,10 +471,39 @@ {1ada1f0f-6f1c-4bf2-8450-1fc63d77da17} + + {9f70c234-1671-49db-aa45-1a6a75698a40} + + + {98967255-542c-490d-9183-a4b21c074703} + + + {aa083b68-34ed-4679-a8de-1797a00a1772} + + + {ffa5052d-e78f-4c47-a43e-e3537c5e7ad0} + + + {3eebbd6c-0c35-4dac-9869-5d38419432a6} + + + {d9e60709-9bf4-4bc7-b902-742219df7ffb} + + + {b10822cf-4cc0-4bc3-91a9-b20cb66e5cbd} + ext\libpng17 + + + Math\lin + + + Math\fast + + \ No newline at end of file diff --git a/Common/CommonTypes.h b/Common/CommonTypes.h index 93a0c8cb30..ab2b7145af 100644 --- a/Common/CommonTypes.h +++ b/Common/CommonTypes.h @@ -22,14 +22,6 @@ #pragma once -struct u24_be { - unsigned char value[3]; - - operator unsigned int(){ - return 0x00000000 | (value[0] << 16) | (value[1] << 8) | (value[2] << 0); - } -}; - #if defined(_MSC_VER) typedef unsigned __int8 u8; diff --git a/ext/native/math/dataconv.cpp b/Common/Data/Convert/SmallDataConvert.cpp similarity index 68% rename from ext/native/math/dataconv.cpp rename to Common/Data/Convert/SmallDataConvert.cpp index 2fcc339c90..4f0d65ea11 100644 --- a/ext/native/math/dataconv.cpp +++ b/Common/Data/Convert/SmallDataConvert.cpp @@ -1,3 +1,3 @@ -#include "dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" alignas(16) const float one_over_255_x4[4] = { 1.0f / 255.0f, 1.0f / 255.0f, 1.0f / 255.0f, 1.0f / 255.0f, }; diff --git a/ext/native/math/dataconv.h b/Common/Data/Convert/SmallDataConvert.h similarity index 100% rename from ext/native/math/dataconv.h rename to Common/Data/Convert/SmallDataConvert.h diff --git a/ext/native/file/ini_file.cpp b/Common/Data/Format/IniFile.cpp similarity index 99% rename from ext/native/file/ini_file.cpp rename to Common/Data/Format/IniFile.cpp index d0a5c71bf9..8e001f802d 100644 --- a/ext/native/file/ini_file.cpp +++ b/Common/Data/Format/IniFile.cpp @@ -16,8 +16,8 @@ #include #include -#include "file/ini_file.h" -#include "file/vfs.h" +#include "Common/Data/Format/IniFile.h" +#include "Common/File/VFS/VFS.h" #include "Common/Data/Text/Parsers.h" #ifdef _WIN32 diff --git a/ext/native/file/ini_file.h b/Common/Data/Format/IniFile.h similarity index 100% rename from ext/native/file/ini_file.h rename to Common/Data/Format/IniFile.h diff --git a/ext/native/file/chunk_file.cpp b/Common/Data/Format/RIFF.cpp similarity index 96% rename from ext/native/file/chunk_file.cpp rename to Common/Data/Format/RIFF.cpp index 2dab992913..2ef0576fde 100644 --- a/ext/native/file/chunk_file.cpp +++ b/Common/Data/Format/RIFF.cpp @@ -1,8 +1,5 @@ -#include "file/chunk_file.h" -#include "file/zip_read.h" -#include "file/file_util.h" - #include "Common/Log.h" +#include "Common/Data/Format/RIFF.h" inline uint32_t flipID(uint32_t id) { return ((id >> 24) & 0xFF) | ((id >> 8) & 0xFF00) | ((id << 8) & 0xFF0000) | ((id << 24) & 0xFF000000); diff --git a/ext/native/file/chunk_file.h b/Common/Data/Format/RIFF.h similarity index 94% rename from ext/native/file/chunk_file.h rename to Common/Data/Format/RIFF.h index ebc2db99a4..ab1b5c020f 100644 --- a/ext/native/file/chunk_file.h +++ b/Common/Data/Format/RIFF.h @@ -1,6 +1,6 @@ #pragma once -// Simple RIFF file format reader/writer. +// Simple RIFF file format reader. // Unrelated to the ChunkFile.h used in Dolphin and PPSSPP. // TO REMEMBER WHEN USING: diff --git a/Common/Data/Text/I18n.cpp b/Common/Data/Text/I18n.cpp index e0bd685049..72e16a6eb6 100644 --- a/Common/Data/Text/I18n.cpp +++ b/Common/Data/Text/I18n.cpp @@ -1,6 +1,6 @@ #include "Common/Data/Text/I18n.h" -#include "file/ini_file.h" -#include "file/vfs.h" +#include "Common/Data/Format/IniFile.h" +#include "Common/File/VFS/VFS.h" #include "Common/StringUtils.h" diff --git a/ext/native/file/free.cpp b/Common/File/DiskFree.cpp similarity index 100% rename from ext/native/file/free.cpp rename to Common/File/DiskFree.cpp diff --git a/ext/native/file/free.h b/Common/File/DiskFree.h similarity index 100% rename from ext/native/file/free.h rename to Common/File/DiskFree.h diff --git a/ext/native/file/path.cpp b/Common/File/PathBrowser.cpp similarity index 99% rename from ext/native/file/path.cpp rename to Common/File/PathBrowser.cpp index e7be80c609..0e02907b46 100644 --- a/ext/native/file/path.cpp +++ b/Common/File/PathBrowser.cpp @@ -2,12 +2,12 @@ #include #include -#include "Common/StringUtils.h" -#include "Common/TimeUtil.h" - -#include "file/path.h" #include "net/http_client.h" #include "net/url.h" + +#include "Common/File/PathBrowser.h" +#include "Common/StringUtils.h" +#include "Common/TimeUtil.h" #include "Common/Thread/ThreadUtil.h" bool LoadRemoteFileList(const std::string &url, bool *cancel, std::vector &files) { diff --git a/ext/native/file/path.h b/Common/File/PathBrowser.h similarity index 93% rename from ext/native/file/path.h rename to Common/File/PathBrowser.h index ed14962156..bdbce21250 100644 --- a/ext/native/file/path.h +++ b/Common/File/PathBrowser.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ public: // Do nothing #elif defined(__linux) char *home = getenv("HOME"); - if (home != NULL && !strncmp(str.c_str(), home, strlen(home))) { + if (home != nullptr && !strncmp(str.c_str(), home, strlen(home))) { str = str.substr(strlen(home)); str.insert(0, 1, '~'); } diff --git a/ext/native/file/zip_read.cpp b/Common/File/VFS/AssetReader.cpp similarity index 60% rename from ext/native/file/zip_read.cpp rename to Common/File/VFS/AssetReader.cpp index 45acc56f9b..1fec28922b 100644 --- a/ext/native/file/zip_read.cpp +++ b/Common/File/VFS/AssetReader.cpp @@ -7,10 +7,9 @@ #include #endif -#include "file/zip_read.h" - #include "Common/Common.h" #include "Common/Log.h" +#include "Common/File/VFS/AssetReader.h" #ifdef __ANDROID__ uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size) { @@ -34,34 +33,6 @@ uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size) { #endif -// The return is non-const because - why not? -uint8_t *ReadLocalFile(const char *filename, size_t *size) { - FILE *file = openCFile(filename, "rb"); - if (!file) { - *size = 0; - return nullptr; - } - fseek(file, 0, SEEK_END); - size_t f_size = ftell(file); - if ((long)f_size < 0) { - *size = 0; - fclose(file); - return nullptr; - } - fseek(file, 0, SEEK_SET); - uint8_t *contents = new uint8_t[f_size+1]; - if (fread(contents, 1, f_size, file) != f_size) { - delete [] contents; - contents = nullptr; - *size = 0; - } else { - contents[f_size] = 0; - *size = f_size; - } - fclose(file); - return contents; -} - #ifdef __ANDROID__ ZipAssetReader::ZipAssetReader(const char *zip_file, const char *in_zip_path) { @@ -258,118 +229,3 @@ bool DirectoryAssetReader::GetFileInfo(const char *path, FileInfo *info) strcat(new_path, path); return getFileInfo(new_path, info); } - -struct VFSEntry { - const char *prefix; - AssetReader *reader; -}; - -static VFSEntry entries[16]; -static int num_entries = 0; - -void VFSRegister(const char *prefix, AssetReader *reader) { - entries[num_entries].prefix = prefix; - entries[num_entries].reader = reader; - DEBUG_LOG(IO, "Registered VFS for prefix %s: %s", prefix, reader->toString().c_str()); - num_entries++; -} - -void VFSShutdown() { - for (int i = 0; i < num_entries; i++) { - delete entries[i].reader; - } - num_entries = 0; -} - -static bool IsLocalPath(const char *path) { - bool isUnixLocal = path[0] == '/'; -#ifdef _WIN32 - bool isWindowsLocal = isalpha(path[0]) && path[1] == ':'; -#else - bool isWindowsLocal = false; -#endif - return isUnixLocal || isWindowsLocal; -} - -// The returned data should be free'd with delete[]. -uint8_t *VFSReadFile(const char *filename, size_t *size) { - if (IsLocalPath(filename)) { - // Local path, not VFS. - // INFO_LOG(IO, "Not a VFS path: %s . Reading local file.", filename); - return ReadLocalFile(filename, size); - } - - int fn_len = (int)strlen(filename); - bool fileSystemFound = false; - for (int i = 0; i < num_entries; i++) { - int prefix_len = (int)strlen(entries[i].prefix); - if (prefix_len >= fn_len) continue; - if (0 == memcmp(filename, entries[i].prefix, prefix_len)) { - fileSystemFound = true; - // INFO_LOG(IO, "Prefix match: %s (%s) -> %s", entries[i].prefix, filename, filename + prefix_len); - uint8_t *data = entries[i].reader->ReadAsset(filename + prefix_len, size); - if (data) - return data; - else - continue; - // Else try the other registered file systems. - } - } - if (!fileSystemFound) { - ERROR_LOG(IO, "Missing filesystem for '%s'", filename); - } // Otherwise, the file was just missing. No need to log. - return 0; -} - -bool VFSGetFileListing(const char *path, std::vector *listing, const char *filter) { - if (IsLocalPath(path)) { - // Local path, not VFS. - // INFO_LOG(IO, "Not a VFS path: %s . Reading local directory.", path); - getFilesInDir(path, listing, filter); - return true; - } - - int fn_len = (int)strlen(path); - bool fileSystemFound = false; - for (int i = 0; i < num_entries; i++) { - int prefix_len = (int)strlen(entries[i].prefix); - if (prefix_len >= fn_len) continue; - if (0 == memcmp(path, entries[i].prefix, prefix_len)) { - fileSystemFound = true; - if (entries[i].reader->GetFileListing(path + prefix_len, listing, filter)) { - return true; - } - } - } - - if (!fileSystemFound) { - ERROR_LOG(IO, "Missing filesystem for %s", path); - } // Otherwise, the file was just missing. No need to log. - return false; -} - -bool VFSGetFileInfo(const char *path, FileInfo *info) { - if (IsLocalPath(path)) { - // Local path, not VFS. - // INFO_LOG(IO, "Not a VFS path: %s . Getting local file info.", path); - return getFileInfo(path, info); - } - - bool fileSystemFound = false; - int fn_len = (int)strlen(path); - for (int i = 0; i < num_entries; i++) { - int prefix_len = (int)strlen(entries[i].prefix); - if (prefix_len >= fn_len) continue; - if (0 == memcmp(path, entries[i].prefix, prefix_len)) { - fileSystemFound = true; - if (entries[i].reader->GetFileInfo(path + prefix_len, info)) - return true; - else - continue; - } - } - if (!fileSystemFound) { - ERROR_LOG(IO, "Missing filesystem for %s", path); - } // Otherwise, the file was just missing. No need to log. - return false; -} diff --git a/ext/native/file/zip_read.h b/Common/File/VFS/AssetReader.h similarity index 98% rename from ext/native/file/zip_read.h rename to Common/File/VFS/AssetReader.h index 086fc43775..76b5a31439 100644 --- a/ext/native/file/zip_read.h +++ b/Common/File/VFS/AssetReader.h @@ -8,7 +8,7 @@ #include #include -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "file/file_util.h" // Direct readers. deallocate using delete []. diff --git a/Common/File/VFS/VFS.cpp b/Common/File/VFS/VFS.cpp new file mode 100644 index 0000000000..0353169d79 --- /dev/null +++ b/Common/File/VFS/VFS.cpp @@ -0,0 +1,118 @@ +#include "Common/Log.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" + +struct VFSEntry { + const char *prefix; + AssetReader *reader; +}; + +static VFSEntry entries[16]; +static int num_entries = 0; + +void VFSRegister(const char *prefix, AssetReader *reader) { + entries[num_entries].prefix = prefix; + entries[num_entries].reader = reader; + DEBUG_LOG(IO, "Registered VFS for prefix %s: %s", prefix, reader->toString().c_str()); + num_entries++; +} + +void VFSShutdown() { + for (int i = 0; i < num_entries; i++) { + delete entries[i].reader; + } + num_entries = 0; +} + +static bool IsLocalPath(const char *path) { + bool isUnixLocal = path[0] == '/'; +#ifdef _WIN32 + bool isWindowsLocal = isalpha(path[0]) && path[1] == ':'; +#else + bool isWindowsLocal = false; +#endif + return isUnixLocal || isWindowsLocal; +} + +// The returned data should be free'd with delete[]. +uint8_t *VFSReadFile(const char *filename, size_t *size) { + if (IsLocalPath(filename)) { + // Local path, not VFS. + // INFO_LOG(IO, "Not a VFS path: %s . Reading local file.", filename); + return ReadLocalFile(filename, size); + } + + int fn_len = (int)strlen(filename); + bool fileSystemFound = false; + for (int i = 0; i < num_entries; i++) { + int prefix_len = (int)strlen(entries[i].prefix); + if (prefix_len >= fn_len) continue; + if (0 == memcmp(filename, entries[i].prefix, prefix_len)) { + fileSystemFound = true; + // INFO_LOG(IO, "Prefix match: %s (%s) -> %s", entries[i].prefix, filename, filename + prefix_len); + uint8_t *data = entries[i].reader->ReadAsset(filename + prefix_len, size); + if (data) + return data; + else + continue; + // Else try the other registered file systems. + } + } + if (!fileSystemFound) { + ERROR_LOG(IO, "Missing filesystem for '%s'", filename); + } // Otherwise, the file was just missing. No need to log. + return 0; +} + +bool VFSGetFileListing(const char *path, std::vector *listing, const char *filter) { + if (IsLocalPath(path)) { + // Local path, not VFS. + // INFO_LOG(IO, "Not a VFS path: %s . Reading local directory.", path); + getFilesInDir(path, listing, filter); + return true; + } + + int fn_len = (int)strlen(path); + bool fileSystemFound = false; + for (int i = 0; i < num_entries; i++) { + int prefix_len = (int)strlen(entries[i].prefix); + if (prefix_len >= fn_len) continue; + if (0 == memcmp(path, entries[i].prefix, prefix_len)) { + fileSystemFound = true; + if (entries[i].reader->GetFileListing(path + prefix_len, listing, filter)) { + return true; + } + } + } + + if (!fileSystemFound) { + ERROR_LOG(IO, "Missing filesystem for %s", path); + } // Otherwise, the file was just missing. No need to log. + return false; +} + +bool VFSGetFileInfo(const char *path, FileInfo *info) { + if (IsLocalPath(path)) { + // Local path, not VFS. + // INFO_LOG(IO, "Not a VFS path: %s . Getting local file info.", path); + return getFileInfo(path, info); + } + + bool fileSystemFound = false; + int fn_len = (int)strlen(path); + for (int i = 0; i < num_entries; i++) { + int prefix_len = (int)strlen(entries[i].prefix); + if (prefix_len >= fn_len) continue; + if (0 == memcmp(path, entries[i].prefix, prefix_len)) { + fileSystemFound = true; + if (entries[i].reader->GetFileInfo(path + prefix_len, info)) + return true; + else + continue; + } + } + if (!fileSystemFound) { + ERROR_LOG(IO, "Missing filesystem for %s", path); + } // Otherwise, the file was just missing. No need to log. + return false; +} diff --git a/ext/native/file/vfs.h b/Common/File/VFS/VFS.h similarity index 100% rename from ext/native/file/vfs.h rename to Common/File/VFS/VFS.h diff --git a/Common/FileUtil.h b/Common/FileUtil.h index f9f86433a7..59552d56a5 100644 --- a/Common/FileUtil.h +++ b/Common/FileUtil.h @@ -114,6 +114,7 @@ bool SetCurrentDir(const std::string &directory); const std::string &GetExeDirectory(); + // simple wrapper for cstdlib file functions to // hopefully will make error checking easier // and make forgetting an fclose() harder diff --git a/Common/Input/GestureDetector.h b/Common/Input/GestureDetector.h index 908f960769..5d4e54f36e 100644 --- a/Common/Input/GestureDetector.h +++ b/Common/Input/GestureDetector.h @@ -1,5 +1,5 @@ #include "Common/Input/InputState.h" -#include "math/geom2d.h" +#include "Common/Math/geom2d.h" // Mainly for detecting (multi-)touch gestures but also useable for left button mouse dragging etc. // Currently only supports simple scroll-drags with inertia. diff --git a/Common/Input/InputState.h b/Common/Input/InputState.h index 175d6786df..59a0a6e057 100644 --- a/Common/Input/InputState.h +++ b/Common/Input/InputState.h @@ -7,7 +7,7 @@ #include #include -#include "math/lin/vec3.h" +#include "Common/Math/lin/vec3.h" #include "Common/Input/KeyCodes.h" // Default device IDs diff --git a/Common/LogManager.h b/Common/LogManager.h index 346561430f..9fcff28d80 100644 --- a/Common/LogManager.h +++ b/Common/LogManager.h @@ -23,7 +23,7 @@ #include #include -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/CommonFuncs.h" #include "Common/Log.h" diff --git a/ext/native/math/curves.cpp b/Common/Math/curves.cpp similarity index 98% rename from ext/native/math/curves.cpp rename to Common/Math/curves.cpp index 65dae53f5e..2488ba5c30 100644 --- a/ext/native/math/curves.cpp +++ b/Common/Math/curves.cpp @@ -1,7 +1,7 @@ #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "curves.h" #include "Common/Common.h" diff --git a/ext/native/math/curves.h b/Common/Math/curves.h similarity index 100% rename from ext/native/math/curves.h rename to Common/Math/curves.h diff --git a/ext/native/math/expression_parser.cpp b/Common/Math/expression_parser.cpp similarity index 92% rename from ext/native/math/expression_parser.cpp rename to Common/Math/expression_parser.cpp index 2c277c000a..9499cce7e0 100644 --- a/ext/native/math/expression_parser.cpp +++ b/Common/Math/expression_parser.cpp @@ -244,7 +244,7 @@ bool initPostfixExpression(const char* infix, IExpressionFunctions* funcs, Postf isFloat = true; else if (parseNumber(subStr,16,subPos,value) == false) { - sprintf(expressionError,"Invalid number \"%s\"",subStr); + snprintf(expressionError, sizeof(expressionError), "Invalid number \"%s\"",subStr); return false; } @@ -273,14 +273,14 @@ bool initPostfixExpression(const char* infix, IExpressionFunctions* funcs, Postf continue; } - sprintf(expressionError,"Invalid symbol \"%s\"",subStr); + snprintf(expressionError, sizeof(expressionError), "Invalid symbol \"%s\"",subStr); return false; } else { int len; ExpressionOpcodeType type = getExpressionOpcode(&infix[infixPos],len,lastOpcode); if (type == EXOP_NONE) { - sprintf(expressionError,"Invalid operator at \"%s\"",&infix[infixPos]); + snprintf(expressionError, sizeof(expressionError), "Invalid operator at \"%s\"",&infix[infixPos]); return false; } @@ -295,7 +295,7 @@ bool initPostfixExpression(const char* infix, IExpressionFunctions* funcs, Postf { if (opcodeStack.empty()) { - sprintf(expressionError,"Closing parenthesis without opening one"); + snprintf(expressionError, sizeof(expressionError), "Closing parenthesis without opening one"); return false; } ExpressionOpcodeType t = opcodeStack[opcodeStack.size()-1]; @@ -309,7 +309,7 @@ bool initPostfixExpression(const char* infix, IExpressionFunctions* funcs, Postf { if (opcodeStack.empty()) { - sprintf(expressionError,"Closing bracket without opening one"); + snprintf(expressionError, sizeof(expressionError), "Closing bracket without opening one"); return false; } ExpressionOpcodeType t = opcodeStack[opcodeStack.size()-1]; @@ -362,7 +362,7 @@ bool initPostfixExpression(const char* infix, IExpressionFunctions* funcs, Postf if (t == EXOP_BRACKETL) // opening bracket without closing one { - sprintf(expressionError,"Parenthesis not closed"); + snprintf(expressionError, sizeof(expressionError), "Parenthesis not closed"); return false; } dest.push_back(ExpressionPair(EXCOMM_OP,t)); @@ -421,7 +421,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, opcode = exp[num++].second; if (valueStack.size() < ExpressionOpcodes[opcode].args) { - sprintf(expressionError,"Not enough arguments"); + snprintf(expressionError, sizeof(expressionError), "Not enough arguments"); return false; } for (int l = 0; l < ExpressionOpcodes[opcode].args; l++) @@ -437,7 +437,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, case EXOP_MEMSIZE: // must be followed by EXOP_MEM if (exp[num++].second != EXOP_MEM) { - sprintf(expressionError,"Invalid memsize operator"); + snprintf(expressionError, sizeof(expressionError), "Invalid memsize operator"); return false; } @@ -481,7 +481,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, case EXOP_DIV: // a/b if (arg[0] == 0) { - sprintf(expressionError,"Division by zero"); + snprintf(expressionError, sizeof(expressionError), "Division by zero"); return false; } if (useFloat) @@ -492,7 +492,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, case EXOP_MOD: // a%b if (arg[0] == 0) { - sprintf(expressionError,"Modulo by zero"); + snprintf(expressionError, sizeof(expressionError), "Modulo by zero"); return false; } valueStack.push_back(arg[1]%arg[0]); @@ -565,7 +565,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, case EXOP_TERTELSE: // exp ? exp : exp, else muss zuerst kommen! if (exp[num++].second != EXOP_TERTIF) { - sprintf(expressionError,"Invalid tertiary operator"); + snprintf(expressionError, sizeof(expressionError), "Invalid tertiary operator"); return false; } valueStack.push_back(arg[2]?arg[1]:arg[0]); @@ -589,6 +589,6 @@ bool parseExpression(char* exp, IExpressionFunctions* funcs, uint32_t& dest) const char* getExpressionError() { - if (expressionError[0] == 0) strcpy(expressionError,"Invalid expression"); + if (expressionError[0] == 0) snprintf(expressionError, sizeof(expressionError), "Invalid expression"); return expressionError; } diff --git a/ext/native/math/expression_parser.h b/Common/Math/expression_parser.h similarity index 100% rename from ext/native/math/expression_parser.h rename to Common/Math/expression_parser.h diff --git a/ext/native/math/fast/fast_math.c b/Common/Math/fast/fast_math.c similarity index 100% rename from ext/native/math/fast/fast_math.c rename to Common/Math/fast/fast_math.c diff --git a/ext/native/math/fast/fast_math.h b/Common/Math/fast/fast_math.h similarity index 100% rename from ext/native/math/fast/fast_math.h rename to Common/Math/fast/fast_math.h diff --git a/ext/native/math/fast/fast_matrix.c b/Common/Math/fast/fast_matrix.c similarity index 100% rename from ext/native/math/fast/fast_matrix.c rename to Common/Math/fast/fast_matrix.c diff --git a/ext/native/math/fast/fast_matrix.h b/Common/Math/fast/fast_matrix.h similarity index 100% rename from ext/native/math/fast/fast_matrix.h rename to Common/Math/fast/fast_matrix.h diff --git a/ext/native/math/fast/fast_matrix_neon.S b/Common/Math/fast/fast_matrix_neon.S similarity index 100% rename from ext/native/math/fast/fast_matrix_neon.S rename to Common/Math/fast/fast_matrix_neon.S diff --git a/ext/native/math/fast/fast_matrix_sse.c b/Common/Math/fast/fast_matrix_sse.c similarity index 100% rename from ext/native/math/fast/fast_matrix_sse.c rename to Common/Math/fast/fast_matrix_sse.c diff --git a/ext/native/math/geom2d.h b/Common/Math/geom2d.h similarity index 100% rename from ext/native/math/geom2d.h rename to Common/Math/geom2d.h diff --git a/ext/native/math/lin/matrix4x4.cpp b/Common/Math/lin/matrix4x4.cpp similarity index 95% rename from ext/native/math/lin/matrix4x4.cpp rename to Common/Math/lin/matrix4x4.cpp index b514714573..e341210cee 100644 --- a/ext/native/math/lin/matrix4x4.cpp +++ b/Common/Math/lin/matrix4x4.cpp @@ -1,9 +1,9 @@ -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include -#include "math/lin/vec3.h" -#include "math/fast/fast_matrix.h" +#include "Common/Math/lin/vec3.h" +#include "Common/Math/fast/fast_matrix.h" #ifdef _WIN32 #undef far diff --git a/ext/native/math/lin/matrix4x4.h b/Common/Math/lin/matrix4x4.h similarity index 98% rename from ext/native/math/lin/matrix4x4.h rename to Common/Math/lin/matrix4x4.h index 70644a80f6..575b6a61d4 100644 --- a/ext/native/math/lin/matrix4x4.h +++ b/Common/Math/lin/matrix4x4.h @@ -1,7 +1,7 @@ #ifndef _MATH_LIN_MATRIX4X4_H #define _MATH_LIN_MATRIX4X4_H -#include "math/lin/vec3.h" +#include "Common/Math/lin/vec3.h" namespace Lin { diff --git a/ext/native/math/lin/matrix_neon.s b/Common/Math/lin/matrix_neon.s similarity index 100% rename from ext/native/math/lin/matrix_neon.s rename to Common/Math/lin/matrix_neon.s diff --git a/ext/native/math/lin/vec3.cpp b/Common/Math/lin/vec3.cpp similarity index 83% rename from ext/native/math/lin/vec3.cpp rename to Common/Math/lin/vec3.cpp index 7c66339cda..8329e2191e 100644 --- a/ext/native/math/lin/vec3.cpp +++ b/Common/Math/lin/vec3.cpp @@ -1,7 +1,7 @@ #include -#include "math/lin/vec3.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/vec3.h" +#include "Common/Math/lin/matrix4x4.h" namespace Lin { diff --git a/ext/native/math/lin/vec3.h b/Common/Math/lin/vec3.h similarity index 100% rename from ext/native/math/lin/vec3.h rename to Common/Math/lin/vec3.h diff --git a/ext/native/math/math_util.cpp b/Common/Math/math_util.cpp similarity index 96% rename from ext/native/math/math_util.cpp rename to Common/Math/math_util.cpp index 11eb15b215..9b1a59a755 100644 --- a/ext/native/math/math_util.cpp +++ b/Common/Math/math_util.cpp @@ -1,4 +1,4 @@ -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include // QNX can only use RunFast mode and it is already the default. diff --git a/ext/native/math/math_util.h b/Common/Math/math_util.h similarity index 100% rename from ext/native/math/math_util.h rename to Common/Math/math_util.h diff --git a/Common/Vulkan/VulkanMemory.cpp b/Common/Vulkan/VulkanMemory.cpp index 74cd1cb660..9674fb702a 100644 --- a/Common/Vulkan/VulkanMemory.cpp +++ b/Common/Vulkan/VulkanMemory.cpp @@ -18,7 +18,7 @@ // Additionally, Common/Vulkan/* , including this file, are also licensed // under the public domain. -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Log.h" #include "Common/TimeUtil.h" diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp index 547ebb5925..bd7c044c8b 100644 --- a/Core/Compatibility.cpp +++ b/Core/Compatibility.cpp @@ -16,7 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "file/ini_file.h" + +#include "Common/Data/Format/IniFile.h" #include "Core/Compatibility.h" #include "Core/System.h" diff --git a/Core/Config.cpp b/Core/Config.cpp index 8f56969908..98a70cfab6 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -25,7 +25,7 @@ #include "ppsspp_config.h" #include "base/display.h" #include "base/NativeApp.h" -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/Data/Text/I18n.h" #include "json/json_reader.h" #include "gfx_es2/gpu_features.h" @@ -35,7 +35,6 @@ #include "Common/CPUDetect.h" #include "Common/FileUtil.h" -#include "Common/KeyMap.h" #include "Common/LogManager.h" #include "Common/OSVersion.h" #include "Common/StringUtils.h" @@ -43,6 +42,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Loaders.h" +#include "Core/KeyMap.h" #include "Core/HLE/sceUtility.h" #include "Core/Instance.h" #include "GPU/Common/FramebufferManagerCommon.h" diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index d1cb94b914..2fc9e33ae1 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -453,6 +453,7 @@ + @@ -996,6 +997,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 611c164009..f59875b48c 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -959,6 +959,9 @@ Ext\libzip + + Core + @@ -1637,6 +1640,9 @@ Ext\libzip + + Core + diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h index 0b98e1d512..6f48c7db0f 100644 --- a/Core/Debugger/DebugInterface.h +++ b/Core/Debugger/DebugInterface.h @@ -19,7 +19,7 @@ #include #include #include "Common/CommonTypes.h" -#include "math/expression_parser.h" +#include "Common/Math/expression_parser.h" struct MemMap; diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index cf52cd9fe0..add21d1cdd 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -18,7 +18,7 @@ #include #include "base/NativeApp.h" #include "Common/Data/Text/I18n.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index fc2991b399..ee028f662d 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -23,8 +23,8 @@ #include "ppsspp_config.h" #include "file/file_util.h" -#include "file/free.h" #include "Common/Data/Encoding/Utf8.h" +#include "Common/File/DiskFree.h" #include "Common/FileUtil.h" #include "Common/CommonWindows.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index b4c3ca2260..0389244e0f 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -20,14 +20,14 @@ #include #include -#include "file/free.h" -#include "file/zip_read.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" #include "Common/FileUtil.h" +#include "Common/File/DiskFree.h" +#include "Common/File/VFS/VFS.h" #include "Core/FileSystems/DirectoryFileSystem.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/HLE/sceKernel.h" diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index c713d9965c..7aaef4327c 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -25,7 +25,6 @@ #include "Core/FileSystems/ISOFileSystem.h" #include "Core/HLE/sceKernel.h" #include "Core/Reporting.h" -#include "file/zip_read.h" #include "Common/Data/Encoding/Utf8.h" #ifdef _WIN32 diff --git a/Core/HLE/Plugins.cpp b/Core/HLE/Plugins.cpp index 5f22e9fc37..9572d6e5ea 100644 --- a/Core/HLE/Plugins.cpp +++ b/Core/HLE/Plugins.cpp @@ -17,7 +17,7 @@ #include #include "file/file_util.h" -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/Config.h" diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp index aa6d554ded..4230675599 100644 --- a/Core/HLE/sceJpeg.cpp +++ b/Core/HLE/sceJpeg.cpp @@ -29,12 +29,20 @@ #include "Core/MemMap.h" #include "Core/Reporting.h" -//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file -//#define JPEG_DEBUG +// Uncomment if you want to dump JPEGs loaded through sceJpeg to a file +// #define JPEG_DEBUG #ifdef JPEG_DEBUG #include "ext/xxhash.h" #endif +struct u24_be { + unsigned char value[3]; + + operator unsigned int() { + return 0x00000000 | (value[0] << 16) | (value[1] << 8) | (value[2] << 0); + } +}; + static int mjpegWidth, mjpegHeight; void __JpegInit() { diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index bc738beebb..966ed2d6c1 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -18,7 +18,7 @@ #include #include -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Common/KeyMap.cpp b/Core/KeyMap.cpp similarity index 99% rename from Common/KeyMap.cpp rename to Core/KeyMap.cpp index 408e8a3124..20d04b9599 100644 --- a/Common/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -27,13 +27,13 @@ #include "ppsspp_config.h" #include "base/NativeApp.h" -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/Input/InputState.h" #include "Common/Log.h" -#include "Common/KeyMap.h" #include "Common/StringUtils.h" #include "Core/HLE/sceUtility.h" #include "Core/Config.h" +#include "Core/KeyMap.h" namespace KeyMap { diff --git a/Common/KeyMap.h b/Core/KeyMap.h similarity index 100% rename from Common/KeyMap.h rename to Core/KeyMap.h diff --git a/Core/MIPS/ARM/ArmCompVFPU.cpp b/Core/MIPS/ARM/ArmCompVFPU.cpp index 979baedfaa..4291f694f2 100644 --- a/Core/MIPS/ARM/ArmCompVFPU.cpp +++ b/Core/MIPS/ARM/ArmCompVFPU.cpp @@ -19,7 +19,7 @@ #if PPSSPP_ARCH(ARM) #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Core/Compatibility.h" #include "Core/Config.h" diff --git a/Core/MIPS/ARM/ArmCompVFPUNEON.cpp b/Core/MIPS/ARM/ArmCompVFPUNEON.cpp index 990e36e293..34bd76f055 100644 --- a/Core/MIPS/ARM/ArmCompVFPUNEON.cpp +++ b/Core/MIPS/ARM/ArmCompVFPUNEON.cpp @@ -30,7 +30,7 @@ #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/CPUDetect.h" #include "Core/MemMap.h" diff --git a/Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp b/Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp index 7fada69a92..5a6f727456 100644 --- a/Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp +++ b/Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp @@ -30,7 +30,7 @@ #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/CPUDetect.h" #include "Core/MemMap.h" diff --git a/Core/MIPS/ARM64/Arm64CompVFPU.cpp b/Core/MIPS/ARM64/Arm64CompVFPU.cpp index b297f139e4..6b6e26eca7 100644 --- a/Core/MIPS/ARM64/Arm64CompVFPU.cpp +++ b/Core/MIPS/ARM64/Arm64CompVFPU.cpp @@ -19,7 +19,7 @@ #if PPSSPP_ARCH(ARM64) #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Core/Compatibility.h" #include "Core/Config.h" diff --git a/Core/MIPS/IR/IRCompVFPU.cpp b/Core/MIPS/IR/IRCompVFPU.cpp index 13fa39b2c2..054594f4c5 100644 --- a/Core/MIPS/IR/IRCompVFPU.cpp +++ b/Core/MIPS/IR/IRCompVFPU.cpp @@ -17,7 +17,7 @@ #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/CPUDetect.h" #include "Core/Compatibility.h" diff --git a/Core/MIPS/IR/IRInterpreter.cpp b/Core/MIPS/IR/IRInterpreter.cpp index 63a1d57189..aa962dbb5e 100644 --- a/Core/MIPS/IR/IRInterpreter.cpp +++ b/Core/MIPS/IR/IRInterpreter.cpp @@ -2,7 +2,7 @@ #include #include "ppsspp_config.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Common.h" #include "Common/BitScan.h" diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index a85e5a9999..37210c8c5d 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -18,7 +18,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp index 49847dc4a5..b49dab057f 100644 --- a/Core/MIPS/MIPSInt.cpp +++ b/Core/MIPS/MIPSInt.cpp @@ -17,7 +17,7 @@ #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/BitSet.h" #include "Common/BitScan.h" diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/MIPSIntVFPU.cpp index bc8d698c59..a9c3b66832 100644 --- a/Core/MIPS/MIPSIntVFPU.cpp +++ b/Core/MIPS/MIPSIntVFPU.cpp @@ -21,7 +21,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Core/Compatibility.h" #include "Core/Core.h" diff --git a/Core/MIPS/x86/Asm.cpp b/Core/MIPS/x86/Asm.cpp index a70a414049..a099e1044b 100644 --- a/Core/MIPS/x86/Asm.cpp +++ b/Core/MIPS/x86/Asm.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "ABI.h" #include "x64Emitter.h" diff --git a/Core/MIPS/x86/CompVFPU.cpp b/Core/MIPS/x86/CompVFPU.cpp index de23b3b2d2..f2cd64fd45 100644 --- a/Core/MIPS/x86/CompVFPU.cpp +++ b/Core/MIPS/x86/CompVFPU.cpp @@ -25,7 +25,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/CPUDetect.h" #include "Common/Log.h" diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index fb4ec02292..21e57bf525 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -21,7 +21,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "profiler/profiler.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 86d73612ed..449070cf6a 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -24,7 +24,7 @@ #include #include "Core/Reporting.h" - +#include "Common/File/VFS/VFS.h" #include "Common/CPUDetect.h" #include "Common/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" @@ -47,9 +47,8 @@ #include "net/http_client.h" #include "net/resolve.h" #include "net/url.h" - +#include "file/file_util.h" #include "Common/Thread/ThreadUtil.h" -#include "file/zip_read.h" namespace Reporting { diff --git a/Core/System.cpp b/Core/System.cpp index e812043278..a9f68c324b 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -33,7 +33,7 @@ #include #include "base/NativeApp.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index 56a3f743f9..c2f8a15533 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -25,7 +25,7 @@ #include "Common/Data/Text/I18n.h" #include "ext/xxhash.h" -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/Data/Text/Parsers.h" #include "Common/ColorConv.h" #include "Common/FileUtil.h" diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp index 3c943bda9a..c0e6b5eb0e 100644 --- a/Core/Util/GameManager.cpp +++ b/Core/Util/GameManager.cpp @@ -30,7 +30,7 @@ #include "ext/libzip/zip.h" #endif #include "Common/Data/Encoding/Utf8.h" -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "Common/Log.h" #include "Common/FileUtil.h" diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index 17881b5204..61507801cb 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -18,7 +18,7 @@ #include #include "Common/Data/Color/RGBAUtil.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_text.h" #include "image/zim_load.h" diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 3a91e60695..1e650b9db1 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -22,9 +22,9 @@ #include #include -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" #include "file/file_util.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "gfx_es2/gpu_features.h" #include "Common/StringUtils.h" diff --git a/GPU/Common/PostShader.h b/GPU/Common/PostShader.h index 3ad0d50485..42aa30d4bc 100644 --- a/GPU/Common/PostShader.h +++ b/GPU/Common/PostShader.h @@ -22,7 +22,7 @@ #include #include -#include "file/ini_file.h" +#include "Common/Data/Format/IniFile.h" struct ShaderInfo { std::string iniFile; // which ini file was this definition in? So we can write settings back later diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index 53c09b9d04..7c8266624b 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -21,9 +21,9 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "file/vfs.h" -#include "file/zip_read.h" #include "thin3d/thin3d.h" + +#include "Common/File/VFS/VFS.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/GPU/Common/ShaderUniforms.cpp b/GPU/Common/ShaderUniforms.cpp index 352ae43ddc..f266721050 100644 --- a/GPU/Common/ShaderUniforms.cpp +++ b/GPU/Common/ShaderUniforms.cpp @@ -3,10 +3,10 @@ #include "ShaderUniforms.h" #include "base/display.h" -#include "math/dataconv.h" -#include "math/lin/matrix4x4.h" -#include "math/math_util.h" -#include "math/lin/vec3.h" +#include "Common/Data/Convert/SmallDataConvert.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Math/lin/vec3.h" #include "GPU/GPUState.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUStateUtils.h" diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index 92d570019a..2f68d891e0 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -17,7 +17,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "gfx_es2/gpu_features.h" #include "Core/Config.h" diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index b48d67529b..83a2beab65 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -20,7 +20,7 @@ #include #include "base/display.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "ext/native/thin3d/thin3d.h" #include "Common/Common.h" diff --git a/GPU/D3D11/ShaderManagerD3D11.cpp b/GPU/D3D11/ShaderManagerD3D11.cpp index 81b093f11d..a6c23e1c9d 100644 --- a/GPU/D3D11/ShaderManagerD3D11.cpp +++ b/GPU/D3D11/ShaderManagerD3D11.cpp @@ -22,9 +22,9 @@ #include -#include "math/lin/matrix4x4.h" -#include "math/math_util.h" -#include "math/dataconv.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "thin3d/thin3d.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp index fc2fd6971e..8ef3d2c574 100644 --- a/GPU/D3D11/StateMappingD3D11.cpp +++ b/GPU/D3D11/StateMappingD3D11.cpp @@ -20,7 +20,7 @@ #include -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp index ffbf31b6e1..5dd5e50bf4 100644 --- a/GPU/D3D11/TextureCacheD3D11.cpp +++ b/GPU/D3D11/TextureCacheD3D11.cpp @@ -36,7 +36,7 @@ #include "Core/Host.h" #include "ext/xxhash.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #define INVALID_TEX (ID3D11ShaderResourceView *)(-1LL) diff --git a/GPU/Directx9/FramebufferManagerDX9.cpp b/GPU/Directx9/FramebufferManagerDX9.cpp index be7f751eda..21cfa45c99 100644 --- a/GPU/Directx9/FramebufferManagerDX9.cpp +++ b/GPU/Directx9/FramebufferManagerDX9.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 "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "ext/native/thin3d/thin3d.h" #include "Common/ColorConv.h" diff --git a/GPU/Directx9/ShaderManagerDX9.cpp b/GPU/Directx9/ShaderManagerDX9.cpp index 2a359f0ef5..e292f185c4 100644 --- a/GPU/Directx9/ShaderManagerDX9.cpp +++ b/GPU/Directx9/ShaderManagerDX9.cpp @@ -24,9 +24,9 @@ #include "gfx/d3d9_shader.h" #include "Common/Data/Text/I18n.h" -#include "math/lin/matrix4x4.h" -#include "math/math_util.h" -#include "math/dataconv.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "thin3d/thin3d.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/GPU/Directx9/ShaderManagerDX9.h b/GPU/Directx9/ShaderManagerDX9.h index fac559e642..31458e1fee 100644 --- a/GPU/Directx9/ShaderManagerDX9.h +++ b/GPU/Directx9/ShaderManagerDX9.h @@ -26,7 +26,7 @@ #include "GPU/Common/ShaderCommon.h" #include "GPU/Common/ShaderId.h" #include "thin3d/d3dx9_loader.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" namespace DX9 { diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp index 49b87913a6..06e2a34b5a 100644 --- a/GPU/Directx9/TextureCacheDX9.cpp +++ b/GPU/Directx9/TextureCacheDX9.cpp @@ -34,7 +34,7 @@ #include "Core/Host.h" #include "ext/xxhash.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" namespace DX9 { diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 76eb5a0393..68c7c6a5d1 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -23,12 +23,12 @@ #include #include -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "gfx/gl_debug_log.h" #include "gfx_es2/gpu_features.h" #include "Common/Data/Text/I18n.h" -#include "math/math_util.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Math/lin/matrix4x4.h" #include "profiler/profiler.h" #include "thin3d/thin3d.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index cfa92a0296..d700ff17ff 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -21,7 +21,7 @@ #include "ext/xxhash.h" #include "gfx/gl_debug_log.h" #include "Common/Data/Text/I18n.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "profiler/profiler.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/Math3D.h b/GPU/Math3D.h index ada1a6931e..873119613d 100644 --- a/GPU/Math3D.h +++ b/GPU/Math3D.h @@ -21,7 +21,7 @@ #include "Common/Common.h" #include "Core/Util/AudioFormat.h" // for clamp_u8 -#include "math/fast/fast_matrix.h" +#include "Common/Math/fast/fast_matrix.h" #if defined(_M_SSE) #include diff --git a/GPU/Software/TransformUnit.cpp b/GPU/Software/TransformUnit.cpp index 6a5819bdfa..501e369e52 100644 --- a/GPU/Software/TransformUnit.cpp +++ b/GPU/Software/TransformUnit.cpp @@ -18,7 +18,7 @@ #include #include -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/MemoryUtil.h" #include "Core/Config.h" #include "GPU/GPUState.h" diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 8123b1275b..52880e958a 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -17,7 +17,7 @@ #include -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "profiler/profiler.h" #include "thin3d/VulkanRenderManager.h" diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index 293ff77be5..092f314514 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -20,8 +20,8 @@ #include "profiler/profiler.h" #include "base/display.h" -#include "math/lin/matrix4x4.h" -#include "math/dataconv.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "ext/native/thin3d/thin3d.h" #include "Common/Vulkan/VulkanContext.h" diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index 6e62cd1338..2c277d7266 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -19,9 +19,9 @@ //#define SHADERLOG #endif -#include "math/lin/matrix4x4.h" -#include "math/math_util.h" -#include "math/dataconv.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "profiler/profiler.h" #include "thin3d/thin3d.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/GPU/Vulkan/ShaderManagerVulkan.h b/GPU/Vulkan/ShaderManagerVulkan.h index e626e84152..6e6a297ee2 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.h +++ b/GPU/Vulkan/ShaderManagerVulkan.h @@ -27,7 +27,7 @@ #include "GPU/Vulkan/VertexShaderGeneratorVulkan.h" #include "GPU/Vulkan/FragmentShaderGeneratorVulkan.h" #include "GPU/Vulkan/VulkanUtil.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "GPU/Common/ShaderUniforms.h" class VulkanContext; diff --git a/GPU/Vulkan/StateMappingVulkan.cpp b/GPU/Vulkan/StateMappingVulkan.cpp index c97bd380be..b35c2114ee 100644 --- a/GPU/Vulkan/StateMappingVulkan.cpp +++ b/GPU/Vulkan/StateMappingVulkan.cpp @@ -20,7 +20,7 @@ #include "Common/Vulkan/VulkanLoader.h" #include "thin3d/VulkanRenderManager.h" -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index e160116cd1..0ff3400c1f 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -19,9 +19,9 @@ #include #include "ext/xxhash.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "Common/Data/Text/I18n.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "profiler/profiler.h" #include "thin3d/thin3d.h" #include "thin3d/VulkanRenderManager.h" diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index af33f80668..7f46133c19 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -33,7 +33,7 @@ #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "QtMain.h" #include "Common/Data/Text/I18n.h" diff --git a/SDL/SDLJoystick.cpp b/SDL/SDLJoystick.cpp index ecb94e25a1..53ed2cc921 100644 --- a/SDL/SDLJoystick.cpp +++ b/SDL/SDLJoystick.cpp @@ -2,7 +2,7 @@ #include #include "base/NativeApp.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "Common/FileUtil.h" #include "Core/Config.h" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 3f50a032cb..ffa534c3af 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -26,7 +26,7 @@ SDLJoystick *joystick = NULL; #include "image/png_load.h" #include "net/resolve.h" #include "NKCodeFromSDL.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "thin3d/GLRenderManager.h" #include "SDL_syswm.h" diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 67dc6245c8..4d60afcaa3 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -1,11 +1,11 @@ #include #include -#include "file/chunk_file.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "ui/root.h" #include "Common/CommonTypes.h" +#include "Common/Data/Format/RIFF.h" #include "Common/Log.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/TimeUtil.h" diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp index 971780ac91..e407df4625 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/ComboKeyMappingScreen.cpp @@ -15,17 +15,17 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "Common/Data/Text/I18n.h" -#include "Common/Data/Color/RGBAUtil.h" #include "base/display.h" -#include "file/path.h" #include "gfx_es2/draw_buffer.h" #include "gfx/texture_atlas.h" -#include "math/curves.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/File/PathBrowser.h" +#include "Common/Math/curves.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Core/Config.h" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index f60f25285f..542a542f38 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -33,7 +33,7 @@ #include "Common/Input/KeyCodes.h" #include "Common/Input/InputState.h" #include "Common/Log.h" -#include "Common/KeyMap.h" +#include "Core/KeyMap.h" #include "Core/Host.h" #include "Core/HLE/sceCtrl.h" #include "Core/System.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 0c816c817f..aa201f9a13 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -27,7 +27,7 @@ #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_text.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "ui/root.h" #include "ui/ui.h" #include "ui/ui_context.h" @@ -36,7 +36,6 @@ #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" -#include "Common/KeyMap.h" #include "Common/Log.h" #include "Common/TimeUtil.h" @@ -49,6 +48,7 @@ #include "Core/CoreParameter.h" #include "Core/Core.h" #include "Core/Host.h" +#include "Core/KeyMap.h" #include "Core/Reporting.h" #include "Core/System.h" #include "GPU/GPUState.h" diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index b4504e611c..0f2c33563d 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -22,10 +22,10 @@ #include #include "Common/Input/KeyCodes.h" +#include "Core/KeyMap.h" #include "ui/screen.h" #include "ui/ui_screen.h" #include "ui/ui_tween.h" -#include "Common/KeyMap.h" struct AxisInput; diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 08699e24c1..c297ca6125 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -23,10 +23,9 @@ #include #include "file/file_util.h" -#include "file/zip_read.h" #include "thin3d/thin3d.h" #include "Common/Thread/PrioritizedWorkQueue.h" - +#include "Common/File/VFS/VFS.h" #include "Common/FileUtil.h" #include "Common/StringUtils.h" #include "Common/TimeUtil.h" diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 472aa840f0..9804387f7e 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -23,7 +23,7 @@ #include "base/NativeApp.h" #include "Common/Data/Color/RGBAUtil.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "net/resolve.h" #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_buffer.h" @@ -50,7 +50,6 @@ #include "UI/ComboKeyMappingScreen.h" #include "UI/GPUDriverTestScreen.h" -#include "Common/KeyMap.h" #include "Common/FileUtil.h" #include "Common/OSVersion.h" #include "Common/TimeUtil.h" @@ -58,6 +57,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Host.h" +#include "Core/KeyMap.h" #include "Core/Instance.h" #include "Core/System.h" #include "Core/Reporting.h" diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index d43bac8a08..0277c34592 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -21,7 +21,7 @@ #include "base/display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "ui/ui_context.h" #include "Common/Log.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 14394a18d3..645a4255cd 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -19,12 +19,11 @@ #include #include "ppsspp_config.h" + #include "base/display.h" #include "base/NativeApp.h" -#include "file/path.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" -#include "math/curves.h" #include "ui/root.h" #include "ui/ui_context.h" #include "ui/view.h" @@ -32,6 +31,8 @@ #include "Common/Data/Color/RGBAUtil.h" #include "Common/Data/Encoding/Utf8.h" +#include "Common/File/PathBrowser.h" +#include "Common/Math/curves.h" #include "Common/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/UI/MainScreen.h b/UI/MainScreen.h index fe1b09ad4b..a4aed944d4 100644 --- a/UI/MainScreen.h +++ b/UI/MainScreen.h @@ -19,10 +19,10 @@ #include -#include "file/path.h" #include "ui/ui_screen.h" #include "ui/viewgroup.h" #include "UI/MiscScreens.h" +#include "Common/File/PathBrowser.h" enum GameBrowserFlags { FLAG_HOMEBREWSTOREBUTTON = 1 diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 9f8044613c..5a861c3d58 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -23,12 +23,12 @@ #include "base/NativeApp.h" #include "base/display.h" #include "gfx_es2/draw_buffer.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "Common/Data/Color/RGBAUtil.h" #include "Common/Data/Text/I18n.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 7b4fd4bff9..2642576e7c 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -45,8 +45,6 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "file/vfs.h" -#include "file/zip_read.h" #include "net/http_client.h" #include "net/resolve.h" #include "gfx/texture_atlas.h" @@ -54,24 +52,25 @@ #include "gfx_es2/gpu_features.h" #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" -#include "math/fast/fast_math.h" -#include "math/math_util.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/fast/fast_math.h" +#include "Common/Math/math_util.h" +#include "Common/Math/lin/matrix4x4.h" #include "profiler/profiler.h" #include "thin3d/thin3d.h" #include "ui/ui.h" #include "ui/screen.h" #include "ui/ui_context.h" #include "ui/view.h" -#include "Common/Data/Encoding/Utf8.h" #include "android/jni/app-android.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/CPUDetect.h" #include "Common/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" -#include "Common/KeyMap.h" #include "Common/LogManager.h" #include "Common/MemArena.h" #include "Common/GraphicsContext.h" @@ -82,6 +81,7 @@ #include "Core/Core.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" #include "Core/Host.h" +#include "Core/KeyMap.h" #include "Core/Reporting.h" #include "Core/SaveState.h" #include "Core/Screenshot.h" diff --git a/UI/OnScreenDisplay.h b/UI/OnScreenDisplay.h index cfd245edb8..381fcf274e 100644 --- a/UI/OnScreenDisplay.h +++ b/UI/OnScreenDisplay.h @@ -4,7 +4,7 @@ #include #include -#include "math/geom2d.h" +#include "Common/Math/geom2d.h" #include "ui/view.h" class DrawBuffer; diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index 680ba3b47c..d8e184da56 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -26,7 +26,6 @@ #endif #include "base/NativeApp.h" -#include "file/path.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" #include "json/json_reader.h" @@ -34,6 +33,7 @@ #include "net/resolve.h" #include "net/url.h" +#include "Common/File/PathBrowser.h" #include "Common/Data/Text/I18n.h" #include "Common/Common.h" #include "Common/TimeUtil.h" diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 0521f830e5..0069f73ae8 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -21,7 +21,7 @@ #include "Common/Data/Color/RGBAUtil.h" #include "gfx_es2/draw_buffer.h" #include "Common/Data/Text/I18n.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "Common/Thread/PrioritizedWorkQueue.h" #include "Common/Data/Encoding/Utf8.h" #include "ui/ui_context.h" diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp index 0ca4228be2..c05be29263 100644 --- a/UI/TextureUtil.cpp +++ b/UI/TextureUtil.cpp @@ -4,9 +4,9 @@ #include "thin3d/thin3d.h" #include "image/zim_load.h" #include "image/png_load.h" -#include "math/math_util.h" -#include "math/curves.h" -#include "file/vfs.h" +#include "Common/Math/math_util.h" +#include "Common/Math/curves.h" +#include "Common/File/VFS/VFS.h" #include "ext/jpge/jpgd.h" #include "ui/view.h" #include "ui/ui_context.h" diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 46b4c49eae..0cba83a89f 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -21,7 +21,7 @@ #include "Common/Data/Color/RGBAUtil.h" #include "gfx_es2/draw_buffer.h" #include "Common/Data/Text/I18n.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "ui/ui_context.h" #include "Common/Common.h" diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 92edcd468f..cc008945d9 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -389,19 +389,34 @@ + + + + + + + + + + + + + + + @@ -425,7 +440,6 @@ - @@ -463,15 +477,30 @@ + + + + + + + + + + + + + + + @@ -482,7 +511,6 @@ - @@ -525,6 +553,10 @@ + + + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 7edd0a7f0e..9f5f440125 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -37,6 +37,27 @@ {7277c320-2c19-40d0-81a4-2f6cbb20790c} + + {f924399b-932d-4aeb-b4e1-1da72f1fd2e3} + + + {211cb745-2675-4667-b0aa-964f33fc67dd} + + + {6f1f3b4e-8efd-4f39-b5a9-50d7c75b4616} + + + {56599f1d-b05b-4b55-b664-e6738d5edafc} + + + {4841c76f-fc06-41b0-9fbf-4d73bd591ce5} + + + {98e1f400-451f-497f-bbbc-e88c74c9aab0} + + + {b23bdba1-6007-4edb-ac75-a04cf8c5e172} + @@ -50,7 +71,6 @@ - @@ -169,6 +189,51 @@ Data\Text + + Data\Convert + + + Math + + + Math + + + Math + + + Math\fast + + + Math\fast + + + Math\fast + + + Math\lin + + + Math\lin + + + File + + + File + + + Data\Format + + + File\VFS + + + File\VFS + + + Data\Format + @@ -193,7 +258,6 @@ - @@ -307,10 +371,63 @@ Data\Text + + Data\Convert + + + Math + + + Math + + + Math + + + Math + + + Math\fast + + + Math\fast + + + Math\lin + + + Math\lin + + + File + + + File + + + Data\Format + + + File\VFS + + + File\VFS + + + Data\Format + ext\libpng17 + + + Math\fast + + + Math\lin + + \ No newline at end of file diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index a860f0886c..1ee0d6c4b8 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -520,6 +520,7 @@ + @@ -745,6 +746,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 8283fb162e..11ff8c7a08 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -910,6 +910,7 @@ Ext\libzip + @@ -1540,6 +1541,7 @@ Ext\libzip + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index 115cd1d8f1..cebd2c1d40 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -381,14 +381,8 @@ - - - - - - @@ -398,16 +392,6 @@ - - - - - - - - - - @@ -429,13 +413,8 @@ - - - - - @@ -445,126 +424,6 @@ - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -605,4 +464,4 @@ - + \ No newline at end of file diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index 63749eb6bf..8a588b0d57 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -7,24 +7,15 @@ {98343696-3517-451a-9b47-94d462263e3e} - - {63177c91-8ebd-4e87-ad4e-e6b8b52879c8} - {8a254b8c-46f2-4ff1-bc53-deea7e614276} {244992ec-8dcf-49f4-b63c-cae6ac437c58} - - {6f098c49-cf71-466b-9b1e-c4287681ab26} - {9d02a269-6cdd-4726-ab58-34c012e37d37} - - {8292cb5c-02c9-46a4-a8d5-ea5e8f362688} - {d8c0dd74-7ad2-440a-a3e0-5dbf3435a2fc} @@ -49,27 +40,12 @@ gfx - - file - file file - - file - - - file - - - file - - - file - ui @@ -94,30 +70,6 @@ ui - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - net @@ -148,9 +100,6 @@ gfx - - math - @@ -178,30 +127,12 @@ gfx - - file - file file - - file - - - file - - - file - - - file - - - file - ui @@ -226,36 +157,6 @@ ui - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - net @@ -295,4 +196,4 @@ gfx - + \ No newline at end of file diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index b66c452f59..6188606368 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -4,18 +4,18 @@ #include #include "base/NativeApp.h" -#include "Common/Input/InputState.h" -#include "file/vfs.h" -#include "file/zip_read.h" #include "file/file_util.h" #include "net/http_client.h" #include "net/resolve.h" #include "base/display.h" -#include "Common/Thread/ThreadUtil.h" #include "thin3d/thin3d_create.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/Common.h" +#include "Common/Input/InputState.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" +#include "Common/Thread/ThreadUtil.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/DirectXHelper.h" #include "Common/FileUtil.h" #include "Common/Log.h" diff --git a/Windows/GEDebugger/SimpleGLWindow.cpp b/Windows/GEDebugger/SimpleGLWindow.cpp index 4586ab566b..3416bc17df 100644 --- a/Windows/GEDebugger/SimpleGLWindow.cpp +++ b/Windows/GEDebugger/SimpleGLWindow.cpp @@ -16,7 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "gfx_es2/glsl_program.h" #include "gfx_es2/gpu_features.h" #include "Common/Common.h" diff --git a/Windows/GEDebugger/VertexPreview.cpp b/Windows/GEDebugger/VertexPreview.cpp index 271302237b..aefddc7088 100644 --- a/Windows/GEDebugger/VertexPreview.cpp +++ b/Windows/GEDebugger/VertexPreview.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 "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "gfx_es2/glsl_program.h" #include "gfx_es2/gpu_features.h" #include "Windows/GEDebugger/GEDebugger.h" diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index f4d2be55bf..3178e1adfe 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -22,7 +22,6 @@ // It's improving slowly, though. :) #include "stdafx.h" #include "Common/CommonWindows.h" -#include "Common/KeyMap.h" #include "Common/OSVersion.h" #include "ppsspp_config.h" @@ -47,6 +46,7 @@ #include "Core/ConfigValues.h" #include "Core/Debugger/SymbolMap.h" #include "Core/Instance.h" +#include "Core/KeyMap.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/MIPS/JitCommon/JitBlockCache.h" #include "Windows/InputBox.h" diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 310be72aa3..fab9c450cc 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -33,6 +33,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/FileSystems/MetaFileSystem.h" +#include "Core/KeyMap.h" #include "UI/OnScreenDisplay.h" #include "Windows/MainWindowMenu.h" #include "Windows/MainWindow.h" diff --git a/Windows/MainWindowMenu.h b/Windows/MainWindowMenu.h index 673681a292..26bdfc608e 100644 --- a/Windows/MainWindowMenu.h +++ b/Windows/MainWindowMenu.h @@ -1,7 +1,6 @@ #pragma once #include "Common/CommonWindows.h" -#include "Common/KeyMap.h" #include namespace MainWindow { diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp index 3622dac160..b052ed3fa9 100644 --- a/Windows/TouchInputHandler.cpp +++ b/Windows/TouchInputHandler.cpp @@ -6,8 +6,10 @@ #include "base/display.h" #include "base/NativeApp.h" + #include "Common/CommonWindows.h" #include "Common/CommonFuncs.h" +#include "Common/Input/InputState.h" #include "Common/Log.h" #include "Common/SysError.h" #include "Windows/MainWindow.h" diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index 17f8da078d..3151a61935 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -6,12 +6,12 @@ #include "base/NativeApp.h" #include "Core/Config.h" #include "Common/CommonWindows.h" -#include "Common/KeyMap.h" #include "Common/Log.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "XinputDevice.h" #include "Core/Core.h" +#include "Core/KeyMap.h" #include "Core/HLE/sceCtrl.h" #include "Common/Timer.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index 33843554dd..40e4acdc34 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -33,8 +33,8 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "file/vfs.h" -#include "file/zip_read.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/Data/Text/I18n.h" #include "profiler/profiler.h" #include "Common/Thread/ThreadUtil.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 34309d62b9..b97043f228 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -270,13 +270,26 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Crypto/sha1.cpp \ $(SRC)/Common/Crypto/sha256.cpp \ $(SRC)/Common/Data/Color/RGBAUtil.cpp \ + $(SRC)/Common/Data/Convert/SmallDataConvert.cpp \ $(SRC)/Common/Data/Encoding/Base64.cpp \ $(SRC)/Common/Data/Encoding/Compression.cpp \ $(SRC)/Common/Data/Encoding/Utf8.cpp \ + $(SRC)/Common/Data/Format/RIFF.cpp \ $(SRC)/Common/Data/Hash/Hash.cpp \ $(SRC)/Common/Data/Text/I18n.cpp \ $(SRC)/Common/Data/Text/Parsers.cpp \ $(SRC)/Common/Data/Text/WrapText.cpp \ + $(SRC)/Common/File/VFS/VFS.cpp \ + $(SRC)/Common/File/VFS/AssetReader.cpp \ + $(SRC)/Common/File/DiskFree.cpp \ + $(SRC)/Common/File/PathBrowser.cpp \ + $(SRC)/Common/Math/fast/fast_math.c \ + $(SRC)/Common/Math/fast/fast_matrix.c \ + $(SRC)/Common/Math/math_util.cpp \ + $(SRC)/Common/Math/curves.cpp \ + $(SRC)/Common/Math/expression_parser.cpp \ + $(SRC)/Common/Math/lin/vec3.cpp.arm \ + $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ @@ -286,7 +299,6 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Serialize/Serializer.cpp \ $(SRC)/Common/ColorConv.cpp \ $(SRC)/Common/ExceptionHandlerSetup.cpp \ - $(SRC)/Common/KeyMap.cpp \ $(SRC)/Common/Log.cpp \ $(SRC)/Common/LogManager.cpp \ $(SRC)/Common/MemArenaAndroid.cpp \ @@ -373,6 +385,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/CwCheat.cpp \ $(SRC)/Core/HDRemaster.cpp \ $(SRC)/Core/Instance.cpp \ + $(SRC)/Core/KeyMap.cpp \ $(SRC)/Core/Host.cpp \ $(SRC)/Core/Loaders.cpp \ $(SRC)/Core/PSPLoaders.cpp \ @@ -615,39 +628,26 @@ LOCAL_SRC_FILES := \ $(SRC)/UI/TextureUtil.cpp \ $(SRC)/UI/ComboKeyMappingScreen.cpp -#NATIVE -#LOCAL_CFLAGS := -O3 -DUSING_GLES2 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS -#LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -#LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../ext $(LOCAL_PATH)/../../ext/libpng17 $(LOCAL_PATH)/../../ext/libzip $(LOCAL_PATH)/../../ext/glslang .. - -#Portable native and separate code on android in future is easy you needs add files -#by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS) -# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - $(SRC)/ext/native/math/fast/fast_matrix_neon.S.neon \ - ../../ext/libpng17/arm/arm_init.c \ - ../../ext/libpng17/arm/filter_neon_intrinsics.c \ - ../../ext/libpng17/arm/filter_neon.S.neon + $(SRC)/Common/Math/fast/fast_matrix_neon.S.neon \ + $(SRC)/ext/libpng17/arm/arm_init.c \ + $(SRC)/ext/libpng17/arm/filter_neon_intrinsics.c \ + $(SRC)/ext/libpng17/arm/filter_neon.S.neon -else ifeq ($(TARGET_ARCH_ABI),armeabi) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 else ifeq ($(TARGET_ARCH_ABI),x86) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - $(SRC)/ext/native/math/fast/fast_matrix_sse.c + $(SRC)/Common/Math/fast/fast_matrix_sse.c else ifeq ($(TARGET_ARCH_ABI),x86_64) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_X64 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - $(SRC)/ext/native/math/fast/fast_matrix_sse.c + $(SRC)/Common/Math/fast/fast_matrix_sse.c endif ifneq ($(SKIPAPP),1) include $(BUILD_SHARED_LIBRARY) endif - ifeq ($(HEADLESS),1) include $(CLEAR_VARS) include $(LOCAL_PATH)/Locals.mk diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 3813fbb44a..b25ff4fdcd 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -52,11 +52,12 @@ struct JNIEnv {}; #include "base/display.h" #include "base/NativeApp.h" #include "Common/Thread/ThreadUtil.h" -#include "file/zip_read.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "profiler/profiler.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "net/resolve.h" #include "Common/Data/Text/Parsers.h" #include "android/jni/AndroidAudio.h" diff --git a/ext/native/base/display.cpp b/ext/native/base/display.cpp index 28a482aa06..f90784b819 100644 --- a/ext/native/base/display.cpp +++ b/ext/native/base/display.cpp @@ -1,5 +1,5 @@ #include "base/display.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" int dp_xres; int dp_yres; diff --git a/ext/native/base/display.h b/ext/native/base/display.h index d91e426931..586c346f77 100644 --- a/ext/native/base/display.h +++ b/ext/native/base/display.h @@ -1,6 +1,6 @@ #pragma once -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" // This is meant to be a framework for handling DPI scaling etc. // For now, it just consists of these ugly globals. diff --git a/ext/native/file/file_util.cpp b/ext/native/file/file_util.cpp index 0453cd5a88..55c31bb677 100644 --- a/ext/native/file/file_util.cpp +++ b/ext/native/file/file_util.cpp @@ -126,6 +126,34 @@ bool readFileToString(bool text_file, const char *filename, std::string &str) return true; } +uint8_t *ReadLocalFile(const char *filename, size_t *size) { + FILE *file = openCFile(filename, "rb"); + if (!file) { + *size = 0; + return nullptr; + } + fseek(file, 0, SEEK_END); + size_t f_size = ftell(file); + if ((long)f_size < 0) { + *size = 0; + fclose(file); + return nullptr; + } + fseek(file, 0, SEEK_SET); + uint8_t *contents = new uint8_t[f_size + 1]; + if (fread(contents, 1, f_size, file) != f_size) { + delete[] contents; + contents = nullptr; + *size = 0; + } else { + contents[f_size] = 0; + *size = f_size; + } + fclose(file); + return contents; +} + + // Returns true if filename is a directory bool isDirectory(const std::string &filename) { FileInfo info; diff --git a/ext/native/file/file_util.h b/ext/native/file/file_util.h index e194f3f2b2..3b2fb8ac6a 100644 --- a/ext/native/file/file_util.h +++ b/ext/native/file/file_util.h @@ -9,10 +9,12 @@ // Whole-file reading/writing bool writeStringToFile(bool text_file, const std::string &str, const char *filename); -bool readFileToString(bool text_file, const char *filename, std::string &str); - bool writeDataToFile(bool text_file, const void* data, const unsigned int size, const char *filename); +bool readFileToString(bool text_file, const char *filename, std::string &str); +// Return value must be delete[]-d. +uint8_t *ReadLocalFile(const char *filename, size_t *size); + // Beginnings of a directory utility system. TODO: Improve. struct FileInfo { diff --git a/ext/native/gfx_es2/draw_buffer.cpp b/ext/native/gfx_es2/draw_buffer.cpp index 15ea08c217..a5c0e5a7a6 100644 --- a/ext/native/gfx_es2/draw_buffer.cpp +++ b/ext/native/gfx_es2/draw_buffer.cpp @@ -4,7 +4,7 @@ #include #include "base/display.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "gfx/texture_atlas.h" #include "gfx/gl_debug_log.h" #include "gfx_es2/draw_buffer.h" diff --git a/ext/native/gfx_es2/draw_buffer.h b/ext/native/gfx_es2/draw_buffer.h index 97edf9f3ca..bfcd756010 100644 --- a/ext/native/gfx_es2/draw_buffer.h +++ b/ext/native/gfx_es2/draw_buffer.h @@ -7,8 +7,8 @@ #include "Common/Data/Color/RGBAUtil.h" #include "gfx/texture_atlas.h" -#include "math/geom2d.h" -#include "math/lin/matrix4x4.h" +#include "Common/Math/geom2d.h" +#include "Common/Math/lin/matrix4x4.h" #include "thin3d/thin3d.h" struct Atlas; diff --git a/ext/native/gfx_es2/glsl_program.cpp b/ext/native/gfx_es2/glsl_program.cpp index 3400b381b3..0578cd2cfe 100644 --- a/ext/native/gfx_es2/glsl_program.cpp +++ b/ext/native/gfx_es2/glsl_program.cpp @@ -4,8 +4,8 @@ #include #include -#include "file/vfs.h" -#include "file/zip_read.h" +#include "Common/File/VFS/VFS.h" +//#include "file/zip_read.h" #include "glsl_program.h" #include "Common/Log.h" diff --git a/ext/native/image/zim_load.cpp b/ext/native/image/zim_load.cpp index 86d2627f0c..80ed88d3c2 100644 --- a/ext/native/image/zim_load.cpp +++ b/ext/native/image/zim_load.cpp @@ -4,8 +4,8 @@ #include "zlib.h" #include "image/zim_load.h" -#include "math/math_util.h" -#include "file/vfs.h" +#include "Common/Math/math_util.h" +#include "Common/File/VFS/VFS.h" #include "Common/Log.h" diff --git a/ext/native/json/json_reader.cpp b/ext/native/json/json_reader.cpp index c0d1f1213a..2f95f082d8 100644 --- a/ext/native/json/json_reader.cpp +++ b/ext/native/json/json_reader.cpp @@ -1,5 +1,4 @@ -#include "file/zip_read.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "json/json_reader.h" namespace json { diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index b5b4fe78b1..55cab0400b 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -372,20 +372,13 @@ - - - - - - - @@ -416,15 +409,6 @@ - - - - - - - - - @@ -464,13 +448,8 @@ true true - - - - - @@ -480,7 +459,6 @@ - @@ -509,18 +487,6 @@ - - - - - - - - - AssemblyAndSourceCode - AssemblyAndSourceCode - AssemblyAndSourceCode - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index cfb2d16ef1..49e559580a 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -5,9 +5,6 @@ tools - - math\fast - base @@ -25,12 +22,6 @@ image - - math - - - math - gfx @@ -40,30 +31,15 @@ profiler - - file - - - file - - - file - gfx - - math - json file - - file - base @@ -85,48 +61,30 @@ ui - - math - ui gfx - - file - ui ui - - math - net ui - - math - gfx gfx - - math\fast - - - math\fast - thin3d @@ -142,12 +100,6 @@ gfx - - file - - - math - net @@ -225,12 +177,6 @@ image - - math - - - math - gfx @@ -240,12 +186,6 @@ profiler - - file - - - file - gfx @@ -255,18 +195,12 @@ file - - file - base ui - - math - net @@ -279,18 +213,12 @@ ui - - math - ui gfx - - file - ui @@ -303,24 +231,12 @@ ui - - math - gfx gfx - - math\fast - - - math\fast - - - math\fast - thin3d @@ -345,9 +261,6 @@ base - - file - thin3d @@ -375,9 +288,6 @@ gfx - - math - thin3d @@ -419,9 +329,6 @@ {828bddaf-63e5-4311-985b-bf377f86ff00} - - {f3f83007-7c3b-473f-a2f7-423c5087fbfa} - {c57b41dd-cc33-46ac-b479-19676455ae54} @@ -443,9 +350,6 @@ {4515306f-4664-46bf-a89b-abfec5520a15} - - {5ce64c0e-98e4-4411-86cc-aacaf2f60b21} - {06c6305a-a646-485b-85b9-645a24dd6553} diff --git a/ext/native/thin3d/GLQueueRunner.cpp b/ext/native/thin3d/GLQueueRunner.cpp index aec9acb5d1..6ce2682804 100644 --- a/ext/native/thin3d/GLQueueRunner.cpp +++ b/ext/native/thin3d/GLQueueRunner.cpp @@ -4,12 +4,12 @@ #include "gfx/gl_debug_log.h" #include "gfx_es2/gpu_features.h" #include "thin3d/DataFormatGL.h" -#include "math/dataconv.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Log.h" #include "Common/MemoryUtil.h" #include "Common/StringUtils.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "Core/Reporting.h" #include "GLQueueRunner.h" diff --git a/ext/native/thin3d/GLRenderManager.h b/ext/native/thin3d/GLRenderManager.h index d9721bf4ae..9fb0bc1847 100644 --- a/ext/native/thin3d/GLRenderManager.h +++ b/ext/native/thin3d/GLRenderManager.h @@ -10,7 +10,7 @@ #include #include "gfx/gl_common.h" -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Log.h" #include "GLQueueRunner.h" diff --git a/ext/native/thin3d/VulkanQueueRunner.h b/ext/native/thin3d/VulkanQueueRunner.h index d46efdb42d..1bad9619ce 100644 --- a/ext/native/thin3d/VulkanQueueRunner.h +++ b/ext/native/thin3d/VulkanQueueRunner.h @@ -4,7 +4,7 @@ #include "Common/Hashmaps.h" #include "Common/Vulkan/VulkanContext.h" -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "thin3d/DataFormat.h" #include "Common/Data/Collections/TinySet.h" diff --git a/ext/native/thin3d/VulkanRenderManager.h b/ext/native/thin3d/VulkanRenderManager.h index 57b1e78ec7..60a99d4cc3 100644 --- a/ext/native/thin3d/VulkanRenderManager.h +++ b/ext/native/thin3d/VulkanRenderManager.h @@ -12,8 +12,8 @@ #include "base/display.h" #include "Common/Vulkan/VulkanContext.h" -#include "math/dataconv.h" -#include "math/math_util.h" +#include "Common/Data/Convert/SmallDataConvert.h" +#include "Common/Math/math_util.h" #include "thin3d/DataFormat.h" #include "thin3d/VulkanQueueRunner.h" diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp index 1a5bc12d85..d111f75461 100644 --- a/ext/native/thin3d/thin3d_d3d11.cpp +++ b/ext/native/thin3d/thin3d_d3d11.cpp @@ -7,7 +7,7 @@ #include "thin3d/d3d11_loader.h" #endif #include "base/display.h" -#include "math/dataconv.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/ColorConv.h" diff --git a/ext/native/thin3d/thin3d_d3d9.cpp b/ext/native/thin3d/thin3d_d3d9.cpp index 8a97cbd26e..464da5c08d 100644 --- a/ext/native/thin3d/thin3d_d3d9.cpp +++ b/ext/native/thin3d/thin3d_d3d9.cpp @@ -33,7 +33,7 @@ #define D3DXERR_INVALIDDATA 0x88760b59 #endif -#include "math/lin/matrix4x4.h" +#include "Common/Math/lin/matrix4x4.h" #include "thin3d/thin3d.h" #include "gfx/d3d9_state.h" diff --git a/ext/native/thin3d/thin3d_gl.cpp b/ext/native/thin3d/thin3d_gl.cpp index abcf53dc3e..222b918a16 100644 --- a/ext/native/thin3d/thin3d_gl.cpp +++ b/ext/native/thin3d/thin3d_gl.cpp @@ -4,9 +4,9 @@ #include #include -#include "math/dataconv.h" -#include "math/math_util.h" -#include "math/lin/matrix4x4.h" +#include "Common/Data/Convert/SmallDataConvert.h" +#include "Common/Math/math_util.h" +#include "Common/Math/lin/matrix4x4.h" #include "thin3d/thin3d.h" #include "thin3d/DataFormatGL.h" #include "gfx/gl_common.h" diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 855f80c7c8..7195bc7bf4 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -22,8 +22,8 @@ #include "base/display.h" #include "image/zim_load.h" -#include "math/lin/matrix4x4.h" -#include "math/dataconv.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Data/Convert/SmallDataConvert.h" #include "thin3d/thin3d.h" #include "thin3d/VulkanRenderManager.h" diff --git a/ext/native/ui/ui_context.h b/ext/native/ui/ui_context.h index 03130d29b9..696e8b6bb8 100644 --- a/ext/native/ui/ui_context.h +++ b/ext/native/ui/ui_context.h @@ -4,8 +4,8 @@ #include #include -#include "math/geom2d.h" -#include "math/lin/vec3.h" +#include "Common/Math/geom2d.h" +#include "Common/Math/lin/vec3.h" #include "gfx/texture_atlas.h" // Everything you need to draw a UI collected into a single unit that can be passed around. diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp index 0406ed271d..3e96d79c39 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/ext/native/ui/ui_screen.cpp @@ -5,7 +5,7 @@ #include "base/display.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "ui/ui_screen.h" #include "ui/ui_context.h" #include "ui/screen.h" diff --git a/ext/native/ui/ui_screen.h b/ext/native/ui/ui_screen.h index 14d9472750..3184b03d09 100644 --- a/ext/native/ui/ui_screen.h +++ b/ext/native/ui/ui_screen.h @@ -2,7 +2,7 @@ #include -#include "math/lin/vec3.h" +#include "Common/Math/lin/vec3.h" #include "ui/screen.h" #include "ui/viewgroup.h" diff --git a/ext/native/ui/view.h b/ext/native/ui/view.h index 379456301f..8c46ff9060 100644 --- a/ext/native/ui/view.h +++ b/ext/native/ui/view.h @@ -16,9 +16,9 @@ #include #include "gfx/texture_atlas.h" -#include "math/lin/matrix4x4.h" -#include "math/math_util.h" -#include "math/geom2d.h" +#include "Common/Math/lin/matrix4x4.h" +#include "Common/Math/math_util.h" +#include "Common/Math/geom2d.h" #include "Common/Common.h" diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp index 2ceae3146a..c48f1d22f2 100644 --- a/ext/native/ui/viewgroup.cpp +++ b/ext/native/ui/viewgroup.cpp @@ -4,7 +4,7 @@ #include #include "Common/Input/KeyCodes.h" -#include "math/curves.h" +#include "Common/Math/curves.h" #include "ui/ui_context.h" #include "ui/ui_tween.h" #include "ui/root.h" diff --git a/ext/native/ui/viewgroup.h b/ext/native/ui/viewgroup.h index d61305b2e9..7b2ec02fb0 100644 --- a/ext/native/ui/viewgroup.h +++ b/ext/native/ui/viewgroup.h @@ -5,7 +5,7 @@ #include #include -#include "math/geom2d.h" +#include "Common/Math/geom2d.h" #include "Common/Input/GestureDetector.h" #include "ui/view.h" diff --git a/headless/SDLHeadlessHost.cpp b/headless/SDLHeadlessHost.cpp index 56e6ddc9d2..baf2da955d 100644 --- a/headless/SDLHeadlessHost.cpp +++ b/headless/SDLHeadlessHost.cpp @@ -23,7 +23,7 @@ #include "headless/SDLHeadlessHost.h" #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "file/zip_read.h" #include "thin3d/thin3d_create.h" #include "thin3d/GLRenderManager.h" diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp index c5b9ef9594..64d22cc57b 100644 --- a/headless/WindowsHeadlessHost.cpp +++ b/headless/WindowsHeadlessHost.cpp @@ -21,8 +21,8 @@ #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" -#include "file/vfs.h" -#include "file/zip_read.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/CommonWindows.h" #include "Common/Log.h" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 145be50d2e..8f7588e532 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -144,14 +144,23 @@ SOURCES_CXX += \ SOURCES_CXX += \ $(COMMONDIR)/Data/Color/RGBAUtil.cpp \ + $(COMMONDIR)/Data/Convert/SmallDataConvert.cpp \ $(COMMONDIR)/Data/Encoding/Base64.cpp \ $(COMMONDIR)/Data/Encoding/Compression.cpp \ $(COMMONDIR)/Data/Encoding/Utf8.cpp \ + $(COMMONDIR)/Data/Format/RIFF.cpp \ + $(COMMONDIR)/Data/Format/IniFile.cpp \ $(COMMONDIR)/Data/Hash/Hash.cpp \ $(COMMONDIR)/Data/Text/I18n.cpp \ $(COMMONDIR)/Data/Text/Parsers.cpp \ $(COMMONDIR)/Data/Text/WrapText.cpp \ +SOURCES_CXX += \ + $(COMMONDIR)/File/VFS/VFS.cpp \ + $(COMMONDIR)/File/VFS/AssetReader.cpp \ + $(COMMONDIR)/File/DiskFree.cpp \ + $(COMMONDIR)/File/PathBrowser.cpp + SOURCES_CXX += \ $(COMMONDIR)/Serialize/Serializer.cpp \ $(COMMONDIR)/Thread/Executor.cpp \ @@ -176,7 +185,6 @@ SOURCES_CXX += \ $(COMMONDIR)/ThreadPools.cpp - SOURCES_CXX += \ $(GPUCOMMONDIR)/VertexDecoderCommon.cpp \ $(GPUCOMMONDIR)/GPUStateUtils.cpp \ @@ -295,9 +303,6 @@ endif SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(NATIVEDIR)/file/fd_util.cpp \ $(NATIVEDIR)/file/file_util.cpp \ - $(NATIVEDIR)/file/ini_file.cpp \ - $(NATIVEDIR)/file/free.cpp \ - $(NATIVEDIR)/file/zip_read.cpp \ $(NATIVEDIR)/gfx/gl_debug_log.cpp \ $(NATIVEDIR)/gfx/texture_atlas.cpp \ $(NATIVEDIR)/gfx/d3d9_shader.cpp \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 4e71ad7000..f0efc6437b 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -21,7 +21,7 @@ #include "Log.h" #include "LogManager.h" #include "ConsoleListener.h" -#include "file/vfs.h" +#include "Common/File/VFS/VFS.h" #include "file/zip_read.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" From 989e3534823d87b922c1a659ff4827eed44afb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 09:29:36 +0200 Subject: [PATCH 2/7] Common.h shouldn't include Log.h. Buildfixes More buildfixes. Move JSON code to common. --- CMakeLists.txt | 8 +++---- Common/Arm64Emitter.cpp | 13 ++++++------ Common/Arm64Emitter.h | 9 ++++---- Common/ArmEmitter.h | 7 ++++--- Common/CodeBlock.h | 6 ++++-- Common/Common.h | 1 - Common/Common.vcxproj | 4 ++++ Common/Common.vcxproj.filters | 12 +++++++++++ .../Data/Format/JSONReader.cpp | 2 +- .../Data/Format/JSONReader.h | 0 .../Data/Format/JSONWriter.cpp | 4 ++-- .../Data/Format/JSONWriter.h | 0 Common/File/PathBrowser.cpp | 1 + Common/FileUtil.cpp | 21 ++++++++++--------- Common/FileUtil.h | 17 ++++++++------- Common/x64Emitter.h | 11 +++++----- Core/Config.cpp | 10 +++++---- Core/Debugger/SymbolMap.cpp | 4 +++- Core/Debugger/WebSocket/WebSocketUtils.cpp | 7 +++++++ Core/Debugger/WebSocket/WebSocketUtils.h | 14 ++++--------- Core/ELF/PrxDecrypter.cpp | 1 + Core/FileLoaders/DiskCachingFileLoader.cpp | 1 + Core/FileLoaders/HTTPFileLoader.cpp | 1 + Core/FileLoaders/LocalFileLoader.cpp | 4 +++- Core/FileSystems/BlockDevices.cpp | 1 + Core/FileSystems/tlzrc.cpp | 3 ++- Core/HLE/sceKernel.h | 1 + Core/MIPS/JitCommon/JitState.h | 1 + Core/MIPS/MIPSAnalyst.cpp | 4 +++- Core/MemFault.cpp | 1 + Core/Replay.cpp | 2 ++ Core/Screenshot.cpp | 1 + Core/WaveFile.cpp | 10 ++++----- Core/WaveFile.h | 3 ++- GPU/Common/FramebufferManagerCommon.h | 1 + GPU/Common/PresentationCommon.cpp | 1 + GPU/Debugger/Debugger.cpp | 1 + GPU/Debugger/Stepping.cpp | 3 ++- GPU/Vulkan/VulkanUtil.h | 1 - UI/RemoteISOScreen.cpp | 2 +- UI/Store.cpp | 5 ++--- UI/TouchControlLayoutScreen.cpp | 1 + UWP/CommonUWP/CommonUWP.vcxproj | 4 ++++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 12 +++++++++++ UWP/NativeUWP/NativeUWP.vcxproj | 4 ---- UWP/NativeUWP/NativeUWP.vcxproj.filters | 4 ---- android/ab.cmd | 5 +++-- android/jni/Android.mk | 18 +++------------- ext/native/native.vcxproj | 4 ---- ext/native/native.vcxproj.filters | 15 ------------- ext/native/thin3d/thin3d_d3d11.cpp | 3 ++- headless/Headless.cpp | 3 ++- headless/StubHost.cpp | 1 + ios/ViewController.mm | 10 ++++----- libretro/Makefile.common | 21 ++++++++----------- libretro/libretro.cpp | 2 +- 56 files changed, 164 insertions(+), 142 deletions(-) rename ext/native/json/json_reader.cpp => Common/Data/Format/JSONReader.cpp (98%) rename ext/native/json/json_reader.h => Common/Data/Format/JSONReader.h (100%) rename ext/native/json/json_writer.cpp => Common/Data/Format/JSONWriter.cpp (99%) rename ext/native/json/json_writer.h => Common/Data/Format/JSONWriter.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bafe8c74b..c1244a96d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,6 +451,10 @@ add_library(Common STATIC Common/Data/Format/RIFF.h Common/Data/Format/IniFile.cpp Common/Data/Format/IniFile.h + Common/Data/Format/JSONReader.h + Common/Data/Format/JSONReader.cpp + Common/Data/Format/JSONWriter.h + Common/Data/Format/JSONWriter.cpp Common/Data/Hash/Hash.cpp Common/Data/Hash/Hash.h Common/Data/Text/I18n.cpp @@ -1041,10 +1045,6 @@ add_library(native STATIC ext/native/image/zim_load.h ext/native/image/zim_save.cpp ext/native/image/zim_save.h - ext/native/json/json_reader.h - ext/native/json/json_reader.cpp - ext/native/json/json_writer.h - ext/native/json/json_writer.cpp ext/native/net/http_client.cpp ext/native/net/http_client.h ext/native/net/http_headers.cpp diff --git a/Common/Arm64Emitter.cpp b/Common/Arm64Emitter.cpp index 928ef5803f..7578dff4f7 100644 --- a/Common/Arm64Emitter.cpp +++ b/Common/Arm64Emitter.cpp @@ -12,13 +12,12 @@ #include #include -#include "Arm64Emitter.h" -#include "MathUtil.h" -#include "CommonTypes.h" -#include "CommonWindows.h" -#include "CPUDetect.h" - -#include "CommonWindows.h" +#include "Common/Arm64Emitter.h" +#include "Common/MathUtil.h" +#include "Common/CommonTypes.h" +#include "Common/CommonWindows.h" +#include "Common/CPUDetect.h" +#include "Common/Log.h" #ifdef IOS #include diff --git a/Common/Arm64Emitter.h b/Common/Arm64Emitter.h index 3e5dd0050b..e63052dcd8 100644 --- a/Common/Arm64Emitter.h +++ b/Common/Arm64Emitter.h @@ -6,10 +6,11 @@ #include -#include "ArmCommon.h" -#include "BitSet.h" -#include "CodeBlock.h" -#include "Common.h" +#include "Common/ArmCommon.h" +#include "Common/BitSet.h" +#include "Common/CodeBlock.h" +#include "Common/Common.h" +#include "Common/Log.h" #define DYNA_REC JIT diff --git a/Common/ArmEmitter.h b/Common/ArmEmitter.h index e100eff197..e3857de088 100644 --- a/Common/ArmEmitter.h +++ b/Common/ArmEmitter.h @@ -20,9 +20,10 @@ #include #include -#include "Common.h" -#include "ArmCommon.h" -#include "CodeBlock.h" +#include "Common/Common.h" +#include "Common/Log.h" +#include "Common/ArmCommon.h" +#include "Common/CodeBlock.h" // VCVT flags #define TO_FLOAT 0 diff --git a/Common/CodeBlock.h b/Common/CodeBlock.h index c4023d4a8e..9aad2440d7 100644 --- a/Common/CodeBlock.h +++ b/Common/CodeBlock.h @@ -5,8 +5,10 @@ #pragma once #include -#include "Common.h" -#include "MemoryUtil.h" + +#include "Common/CommonTypes.h" +#include "Common/Log.h" +#include "Common/MemoryUtil.h" // Everything that needs to generate code should inherit from this. // You get memory management for free, plus, you can use all emitter functions without diff --git a/Common/Common.h b/Common/Common.h index 42a7846746..184db926d7 100644 --- a/Common/Common.h +++ b/Common/Common.h @@ -28,7 +28,6 @@ #pragma warning(disable:4996) #endif -#include "Log.h" #include "CommonTypes.h" #include "CommonFuncs.h" diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index d914911c40..99dc270595 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -369,6 +369,8 @@ + + @@ -647,6 +649,8 @@ + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index ae66327176..2a3ba0cc61 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -220,6 +220,12 @@ Data\Format + + Data\Format + + + Data\Format + @@ -421,6 +427,12 @@ Data\Format + + Data\Format + + + Data\Format + diff --git a/ext/native/json/json_reader.cpp b/Common/Data/Format/JSONReader.cpp similarity index 98% rename from ext/native/json/json_reader.cpp rename to Common/Data/Format/JSONReader.cpp index 2f95f082d8..125a136258 100644 --- a/ext/native/json/json_reader.cpp +++ b/Common/Data/Format/JSONReader.cpp @@ -1,5 +1,5 @@ #include "Common/File/VFS/VFS.h" -#include "json/json_reader.h" +#include "Common/Data/Format/JSONReader.h" namespace json { diff --git a/ext/native/json/json_reader.h b/Common/Data/Format/JSONReader.h similarity index 100% rename from ext/native/json/json_reader.h rename to Common/Data/Format/JSONReader.h diff --git a/ext/native/json/json_writer.cpp b/Common/Data/Format/JSONWriter.cpp similarity index 99% rename from ext/native/json/json_writer.cpp rename to Common/Data/Format/JSONWriter.cpp index 7440cf731d..3d0801be94 100644 --- a/ext/native/json/json_writer.cpp +++ b/Common/Data/Format/JSONWriter.cpp @@ -2,8 +2,8 @@ #include #include -#include "json/json_reader.h" -#include "json/json_writer.h" +#include "Common/Data/Format/JSONReader.h" +#include "Common/Data/Format/JSONWriter.h" namespace json { diff --git a/ext/native/json/json_writer.h b/Common/Data/Format/JSONWriter.h similarity index 100% rename from ext/native/json/json_writer.h rename to Common/Data/Format/JSONWriter.h diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp index 0e02907b46..a57390d447 100644 --- a/Common/File/PathBrowser.cpp +++ b/Common/File/PathBrowser.cpp @@ -8,6 +8,7 @@ #include "Common/File/PathBrowser.h" #include "Common/StringUtils.h" #include "Common/TimeUtil.h" +#include "Common/Log.h" #include "Common/Thread/ThreadUtil.h" bool LoadRemoteFileList(const std::string &url, bool *cancel, std::vector &files) { diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index f7d78334b6..54c6f8da85 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -27,6 +27,7 @@ #include #include +#include "Common/Log.h" #include "Common/FileUtil.h" #include "Common/StringUtils.h" #include "Common/SysError.h" @@ -511,7 +512,7 @@ bool GetFileDetails(const std::string &filename, FileDetails *details) { if (!GetFileAttributesEx(ConvertUTF8ToWString(filename).c_str(), GetFileExInfoStandard, &attr)) return false; details->isDirectory = (attr.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - details->size = ((u64)attr.nFileSizeHigh << 32) | (u64)attr.nFileSizeLow; + details->size = ((uint64_t)attr.nFileSizeHigh << 32) | (uint64_t)attr.nFileSizeLow; details->atime = FiletimeToStatTime(attr.ftLastAccessTime); details->mtime = FiletimeToStatTime(attr.ftLastWriteTime); details->ctime = FiletimeToStatTime(attr.ftCreationTime); @@ -588,14 +589,14 @@ std::string GetFilename(std::string path) { // Returns the size of file (64bit) // TODO: Add a way to return an error. -u64 GetFileSize(const std::string &filename) { +uint64_t GetFileSize(const std::string &filename) { #if defined(_WIN32) && defined(UNICODE) WIN32_FILE_ATTRIBUTE_DATA attr; if (!GetFileAttributesEx(ConvertUTF8ToWString(filename).c_str(), GetFileExInfoStandard, &attr)) return 0; if (attr.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) return 0; - return ((u64)attr.nFileSizeHigh << 32) | (u64)attr.nFileSizeLow; + return ((uint64_t)attr.nFileSizeHigh << 32) | (uint64_t)attr.nFileSizeLow; #else #if __ANDROID__ && __ANDROID_API__ < 21 struct stat file_info; @@ -618,14 +619,14 @@ u64 GetFileSize(const std::string &filename) { } // Overloaded GetSize, accepts FILE* -u64 GetFileSize(FILE *f) { +uint64_t GetFileSize(FILE *f) { // can't use off_t here because it can be 32-bit - u64 pos = ftello(f); + uint64_t pos = ftello(f); if (fseeko(f, 0, SEEK_END) != 0) { ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str()); return 0; } - u64 size = ftello(f); + uint64_t size = ftello(f); if ((size != pos) && (fseeko(f, pos, SEEK_SET) != 0)) { ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str()); return 0; @@ -904,7 +905,7 @@ void IOFile::SetHandle(std::FILE* file) m_file = file; } -u64 IOFile::GetSize() +uint64_t IOFile::GetSize() { if (IsOpen()) return File::GetFileSize(m_file); @@ -912,7 +913,7 @@ u64 IOFile::GetSize() return 0; } -bool IOFile::Seek(s64 off, int origin) +bool IOFile::Seek(int64_t off, int origin) { if (!IsOpen() || 0 != fseeko(m_file, off, origin)) m_good = false; @@ -920,7 +921,7 @@ bool IOFile::Seek(s64 off, int origin) return m_good; } -u64 IOFile::Tell() +uint64_t IOFile::Tell() { if (IsOpen()) return ftello(m_file); @@ -936,7 +937,7 @@ bool IOFile::Flush() return m_good; } -bool IOFile::Resize(u64 size) +bool IOFile::Resize(uint64_t size) { if (!IsOpen() || 0 != #ifdef _WIN32 diff --git a/Common/FileUtil.h b/Common/FileUtil.h index 59552d56a5..08f1c42615 100644 --- a/Common/FileUtil.h +++ b/Common/FileUtil.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "Common.h" @@ -37,7 +38,7 @@ namespace File { struct FileDetails { bool isDirectory; - u64 size; + uint64_t size; uint64_t atime; uint64_t mtime; uint64_t ctime; @@ -70,10 +71,10 @@ std::string GetFilename(std::string path); bool GetModifTime(const std::string &filename, tm &return_time); // Returns the size of filename (64bit) -u64 GetFileSize(const std::string &filename); +uint64_t GetFileSize(const std::string &filename); // Overloaded GetSize, accepts FILE* -u64 GetFileSize(FILE *f); +uint64_t GetFileSize(FILE *f); // Returns true if successful, or path already exists. bool CreateDir(const std::string &filename); @@ -121,7 +122,7 @@ const std::string &GetExeDirectory(); class IOFile { public: IOFile(); - IOFile(std::FILE* file); + IOFile(FILE* file); IOFile(const std::string& filename, const char openmode[]); ~IOFile(); @@ -172,10 +173,10 @@ public: void SetHandle(std::FILE* file); - bool Seek(s64 off, int origin); - u64 Tell(); - u64 GetSize(); - bool Resize(u64 size); + bool Seek(int64_t off, int origin); + uint64_t Tell(); + uint64_t GetSize(); + bool Resize(uint64_t size); bool Flush(); // clear error state diff --git a/Common/x64Emitter.h b/Common/x64Emitter.h index a89cd11afb..fe32fa0d6d 100644 --- a/Common/x64Emitter.h +++ b/Common/x64Emitter.h @@ -15,14 +15,15 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _DOLPHIN_INTEL_CODEGEN_ -#define _DOLPHIN_INTEL_CODEGEN_ +#pragma once #include "ppsspp_config.h" #include -#include "Common.h" -#include "CodeBlock.h" + +#include "Common/Common.h" +#include "Common/Log.h" +#include "Common/CodeBlock.h" #if PPSSPP_ARCH(64BIT) #define PTRBITS 64 @@ -1083,5 +1084,3 @@ public: }; } // namespace - -#endif diff --git a/Core/Config.cpp b/Core/Config.cpp index 98a70cfab6..a1a3b31d34 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -23,16 +23,18 @@ #include #include "ppsspp_config.h" + #include "base/display.h" #include "base/NativeApp.h" -#include "Common/Data/Format/IniFile.h" -#include "Common/Data/Text/I18n.h" -#include "json/json_reader.h" #include "gfx_es2/gpu_features.h" #include "net/http_client.h" -#include "Common/Data/Text/Parsers.h" #include "net/url.h" +#include "Common/Log.h" +#include "Common/Data/Format/IniFile.h" +#include "Common/Data/Format/JSONReader.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Text/Parsers.h" #include "Common/CPUDetect.h" #include "Common/FileUtil.h" #include "Common/LogManager.h" diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index bc5dc32e2a..4ca7bec75e 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -31,9 +31,11 @@ #include #include -#include "Common/Data/Encoding/Utf8.h" #include "zlib.h" + #include "Common/CommonTypes.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Log.h" #include "Common/FileUtil.h" #include "Common/StringUtils.h" #include "Core/MemMap.h" diff --git a/Core/Debugger/WebSocket/WebSocketUtils.cpp b/Core/Debugger/WebSocket/WebSocketUtils.cpp index 1f34621ee1..a9120b5caa 100644 --- a/Core/Debugger/WebSocket/WebSocketUtils.cpp +++ b/Core/Debugger/WebSocket/WebSocketUtils.cpp @@ -17,10 +17,17 @@ #include #include + #include "Common/Data/Text/Parsers.h" #include "Common/StringUtils.h" #include "Core/Debugger/WebSocket/WebSocketUtils.h" +inline void DebuggerJsonAddTicket(JsonWriter &writer, const JsonGet &data) { + const JsonNode *value = data.get("ticket"); + if (value) + writer.writeRaw("ticket", json_stringify(value)); +} + JsonWriter &DebuggerRequest::Respond() { writer_.begin(); writer_.writeString("event", name); diff --git a/Core/Debugger/WebSocket/WebSocketUtils.h b/Core/Debugger/WebSocket/WebSocketUtils.h index 995568dc52..24752274f2 100644 --- a/Core/Debugger/WebSocket/WebSocketUtils.h +++ b/Core/Debugger/WebSocket/WebSocketUtils.h @@ -17,15 +17,15 @@ #pragma once +#include "ppsspp_config.h" + #include -#include "json/json_reader.h" -#include "json/json_writer.h" #include "net/websocket_server.h" #include "Common/Log.h" - -#include "ppsspp_config.h" +#include "Common/Data/Format/JSONReader.h" +#include "Common/Data/Format/JSONWriter.h" #if PPSSPP_PLATFORM(UWP) // Enum name overlapped with UWP macro, quick hack to disable it @@ -34,12 +34,6 @@ using namespace json; -static inline void DebuggerJsonAddTicket(JsonWriter &writer, const JsonGet &data) { - const JsonNode *value = data.get("ticket"); - if (value) - writer.writeRaw("ticket", json_stringify(value)); -} - struct DebuggerErrorEvent { DebuggerErrorEvent(const std::string m, LogTypes::LOG_LEVELS l, const JsonGet data = JsonValue(JSON_NULL)) : message(m), level(l) { diff --git a/Core/ELF/PrxDecrypter.cpp b/Core/ELF/PrxDecrypter.cpp index f87fa91fd7..bb0088cef5 100644 --- a/Core/ELF/PrxDecrypter.cpp +++ b/Core/ELF/PrxDecrypter.cpp @@ -8,6 +8,7 @@ extern "C" #include "ext/libkirk/SHA1.h" } #include "Common/Common.h" +#include "Common/Log.h" #include "Common/Swap.h" #include "Core/ELF/PrxDecrypter.h" diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index ee028f662d..e8a940b7d0 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -26,6 +26,7 @@ #include "Common/Data/Encoding/Utf8.h" #include "Common/File/DiskFree.h" #include "Common/FileUtil.h" +#include "Common/Log.h" #include "Common/CommonWindows.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" #include "Core/System.h" diff --git a/Core/FileLoaders/HTTPFileLoader.cpp b/Core/FileLoaders/HTTPFileLoader.cpp index 094e78e639..9cf2d653b6 100644 --- a/Core/FileLoaders/HTTPFileLoader.cpp +++ b/Core/FileLoaders/HTTPFileLoader.cpp @@ -18,6 +18,7 @@ #include #include "Common/Common.h" +#include "Common/Log.h" #include "Common/StringUtils.h" #include "Core/FileLoaders/HTTPFileLoader.h" diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index fc91550059..f01eaffdda 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -18,8 +18,10 @@ #include #include "ppsspp_config.h" -#include "Common/Data/Encoding/Utf8.h" + #include "file/file_util.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Log.h" #include "Common/FileUtil.h" #include "Core/FileLoaders/LocalFileLoader.h" diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index a890926cac..368d78a296 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -21,6 +21,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/FileUtil.h" +#include "Common/Log.h" #include "Common/Swap.h" #include "Core/Loaders.h" #include "Core/Host.h" diff --git a/Core/FileSystems/tlzrc.cpp b/Core/FileSystems/tlzrc.cpp index 5692d52d92..414fec0032 100644 --- a/Core/FileSystems/tlzrc.cpp +++ b/Core/FileSystems/tlzrc.cpp @@ -23,7 +23,8 @@ #include #include -#include "Common.h" +#include "Common/Common.h" +#include "Common/Log.h" /*************************************************************/ diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h index c9d4e20d4c..ca9bdfc2d1 100644 --- a/Core/HLE/sceKernel.h +++ b/Core/HLE/sceKernel.h @@ -21,6 +21,7 @@ #include #include "Common/Common.h" +#include "Common/Log.h" #include "Common/Swap.h" class PointerWrap; diff --git a/Core/MIPS/JitCommon/JitState.h b/Core/MIPS/JitCommon/JitState.h index a8bb4e6691..d3c998f817 100644 --- a/Core/MIPS/JitCommon/JitState.h +++ b/Core/MIPS/JitCommon/JitState.h @@ -19,6 +19,7 @@ #pragma once #include "Common/Common.h" +#include "Common/Log.h" #include "Core/MIPS/MIPS.h" struct JitBlock; diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index 6bb213ef05..b38211c0a0 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -22,7 +22,10 @@ #include #include "ext/cityhash/city.h" +#include "ext/xxhash.h" + #include "Common/FileUtil.h" +#include "Common/Log.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/MemMap.h" @@ -35,7 +38,6 @@ #include "Core/Debugger/SymbolMap.h" #include "Core/Debugger/DebugInterface.h" #include "Core/HLE/ReplaceTables.h" -#include "ext/xxhash.h" using namespace MIPSCodeUtils; diff --git a/Core/MemFault.cpp b/Core/MemFault.cpp index 5e8748a333..a550375161 100644 --- a/Core/MemFault.cpp +++ b/Core/MemFault.cpp @@ -28,6 +28,7 @@ #include "ext/disarm.h" #endif +#include "Common/Log.h" #include "Core/Core.h" #include "Core/MemFault.h" #include "Core/MemMap.h" diff --git a/Core/Replay.cpp b/Core/Replay.cpp index 0e76c2c481..bc188fcb31 100644 --- a/Core/Replay.cpp +++ b/Core/Replay.cpp @@ -18,7 +18,9 @@ #include #include #include + #include "Common/Common.h" +#include "Common/Log.h" #include "Common/FileUtil.h" #include "Common/StringUtils.h" #include "Core/Replay.h" diff --git a/Core/Screenshot.cpp b/Core/Screenshot.cpp index 74c10ca2fe..f1d714d7e7 100644 --- a/Core/Screenshot.cpp +++ b/Core/Screenshot.cpp @@ -27,6 +27,7 @@ #include "Common/ColorConv.h" #include "Common/FileUtil.h" +#include "Common/Log.h" #include "Core/Config.h" #include "Core/Screenshot.h" #include "Core/Core.h" diff --git a/Core/WaveFile.cpp b/Core/WaveFile.cpp index 20f98a766f..1f4f4bdef4 100644 --- a/Core/WaveFile.cpp +++ b/Core/WaveFile.cpp @@ -44,7 +44,7 @@ bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRa Write(16); // size of fmt block Write(0x00020001); // two channels, uncompressed - const u32 sample_rate = HLESampleRate; + const uint32_t sample_rate = HLESampleRate; Write(sample_rate); Write(sample_rate * 2 * 2); // two channels, 16bit @@ -53,7 +53,7 @@ bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRa Write(100 * 1000 * 1000 - 32); // We are now at offset 44 - u64 offset = file.Tell(); + uint64_t offset = file.Tell(); _assert_msg_(offset == 44, "Wrong offset: %lld", (long long)offset); return true; } @@ -70,7 +70,7 @@ void WaveFileWriter::Stop() file.Close(); } -void WaveFileWriter::Write(u32 value) +void WaveFileWriter::Write(uint32_t value) { file.WriteArray(&value, 1); } @@ -80,7 +80,7 @@ void WaveFileWriter::Write4(const char* ptr) file.WriteBytes(ptr, 4); } -void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count) +void WaveFileWriter::AddStereoSamples(const short* sample_data, uint32_t count) { _assert_msg_(file, "WaveFileWriter - file not open."); _assert_msg_(count <= BUFFER_SIZE * 2, "WaveFileWriter - buffer too small (count = %u).", count); @@ -89,7 +89,7 @@ void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count) { bool all_zero = true; - for (u32 i = 0; i < count * 2; i++) + for (uint32_t i = 0; i < count * 2; i++) { if (sample_data[i]) all_zero = false; diff --git a/Core/WaveFile.h b/Core/WaveFile.h index b9dcad5f1e..4366cd936c 100644 --- a/Core/WaveFile.h +++ b/Core/WaveFile.h @@ -14,6 +14,7 @@ #include #include +#include #include "Common/FileUtil.h" @@ -36,6 +37,6 @@ private: bool skip_silence = false; uint32_t audio_size = 0; std::array conv_buffer{}; - void Write(u32 value); + void Write(uint32_t value); void Write4(const char* ptr); }; diff --git a/GPU/Common/FramebufferManagerCommon.h b/GPU/Common/FramebufferManagerCommon.h index 05a2a787b6..1dc6abcde8 100644 --- a/GPU/Common/FramebufferManagerCommon.h +++ b/GPU/Common/FramebufferManagerCommon.h @@ -22,6 +22,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/Log.h" #include "Core/MemMap.h" #include "GPU/GPU.h" #include "GPU/ge_constants.h" diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index 7c8266624b..0d74e0c661 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -24,6 +24,7 @@ #include "thin3d/thin3d.h" #include "Common/File/VFS/VFS.h" +#include "Common/Log.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/GPU/Debugger/Debugger.cpp b/GPU/Debugger/Debugger.cpp index 2d5da1af3a..5c70f1066d 100644 --- a/GPU/Debugger/Debugger.cpp +++ b/GPU/Debugger/Debugger.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 "Common/Log.h" #include "GPU/GPU.h" #include "GPU/Debugger/Breakpoints.h" #include "GPU/Debugger/Debugger.h" diff --git a/GPU/Debugger/Stepping.cpp b/GPU/Debugger/Stepping.cpp index bf5ddb4834..2cc06f52fe 100644 --- a/GPU/Debugger/Stepping.cpp +++ b/GPU/Debugger/Stepping.cpp @@ -18,10 +18,11 @@ #include #include +#include "Common/Log.h" +#include "Core/Core.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/Debugger/Stepping.h" #include "GPU/GPUState.h" -#include "Core/Core.h" namespace GPUStepping { diff --git a/GPU/Vulkan/VulkanUtil.h b/GPU/Vulkan/VulkanUtil.h index 44d4cf6be0..cac2698591 100644 --- a/GPU/Vulkan/VulkanUtil.h +++ b/GPU/Vulkan/VulkanUtil.h @@ -154,7 +154,6 @@ private: void DestroyDeviceObjects(); VulkanContext *vulkan_ = nullptr; - VkPipelineCache cache_ = VK_NULL_HANDLE; VkDescriptorSetLayout descriptorSetLayout_ = VK_NULL_HANDLE; VkPipelineLayout pipelineLayout_ = VK_NULL_HANDLE; VkPipelineCache pipelineCache_ = VK_NULL_HANDLE; diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index d8e184da56..be00a5eae6 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -28,12 +28,12 @@ #include "base/NativeApp.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" -#include "json/json_reader.h" #include "net/http_client.h" #include "net/resolve.h" #include "net/url.h" #include "Common/File/PathBrowser.h" +#include "Common/Data/Format/JSONReader.h" #include "Common/Data/Text/I18n.h" #include "Common/Common.h" #include "Common/TimeUtil.h" diff --git a/UI/Store.cpp b/UI/Store.cpp index f07a95d868..040decc9bc 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -17,9 +17,6 @@ #include -#include "json/json_reader.h" - -#include "Common/Data/Text/I18n.h" #include "ui/screen.h" #include "ui/ui_context.h" #include "ui/viewgroup.h" @@ -27,6 +24,8 @@ #include "Common/Common.h" #include "Common/Log.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Format/JSONReader.h" #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/System.h" diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 0cba83a89f..fd06719aad 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -25,6 +25,7 @@ #include "ui/ui_context.h" #include "Common/Common.h" +#include "Common/Log.h" #include "Core/Config.h" #include "Core/System.h" #include "UI/GamepadEmu.h" diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index cc008945d9..de272962bf 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -396,6 +396,8 @@ + + @@ -482,6 +484,8 @@ + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 9f5f440125..674947102e 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -234,6 +234,12 @@ Data\Format + + Data\Format + + + Data\Format + @@ -416,6 +422,12 @@ Data\Format + + Data\Format + + + Data\Format + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index cebd2c1d40..721cda4f7d 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -384,8 +384,6 @@ - - @@ -416,8 +414,6 @@ - - diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index 8a588b0d57..a2f90645d1 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -100,8 +100,6 @@ gfx - - net @@ -187,8 +185,6 @@ gfx - - net diff --git a/android/ab.cmd b/android/ab.cmd index 6befeb03b3..e6f3b7771d 100644 --- a/android/ab.cmd +++ b/android/ab.cmd @@ -5,6 +5,7 @@ copy ..\assets\langregion.ini assets\langregion.ini copy ..\assets\compat.ini assets\compat.ini copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf copy ..\assets\*.png assets\ -SET NDK=C:\AndroidNDK +REM SET NDK=C:\Android\sdk\ndk\21.3.6528147 +SET NDK=C:\Android\ndk SET NDK_MODULE_PATH=..\ext;..\ext\native\ext -%NDK%/ndk-build -j9 %* +%NDK%/ndk-build -j32 %* diff --git a/android/jni/Android.mk b/android/jni/Android.mk index b97043f228..8654dee504 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -104,22 +104,7 @@ endif NATIVE_FILES :=\ $(SRC)/ext/native/base/display.cpp \ $(SRC)/ext/native/file/fd_util.cpp \ - $(SRC)/ext/native/file/chunk_file.cpp \ $(SRC)/ext/native/file/file_util.cpp \ - $(SRC)/ext/native/file/free.cpp \ - $(SRC)/ext/native/file/path.cpp \ - $(SRC)/ext/native/file/ini_file.cpp \ - $(SRC)/ext/native/file/zip_read.cpp \ - $(SRC)/ext/native/json/json_reader.cpp \ - $(SRC)/ext/native/json/json_writer.cpp \ - $(SRC)/ext/native/math/fast/fast_math.c \ - $(SRC)/ext/native/math/fast/fast_matrix.c \ - $(SRC)/ext/native/math/dataconv.cpp \ - $(SRC)/ext/native/math/math_util.cpp \ - $(SRC)/ext/native/math/curves.cpp \ - $(SRC)/ext/native/math/expression_parser.cpp \ - $(SRC)/ext/native/math/lin/vec3.cpp.arm \ - $(SRC)/ext/native/math/lin/matrix4x4.cpp.arm \ $(SRC)/ext/native/net/http_client.cpp \ $(SRC)/ext/native/net/http_server.cpp \ $(SRC)/ext/native/net/http_headers.cpp \ @@ -275,6 +260,9 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Data/Encoding/Compression.cpp \ $(SRC)/Common/Data/Encoding/Utf8.cpp \ $(SRC)/Common/Data/Format/RIFF.cpp \ + $(SRC)/Common/Data/Format/IniFile.cpp \ + $(SRC)/Common/Data/Format/JSONReader.cpp \ + $(SRC)/Common/Data/Format/JSONWriter.cpp \ $(SRC)/Common/Data/Hash/Hash.cpp \ $(SRC)/Common/Data/Text/I18n.cpp \ $(SRC)/Common/Data/Text/Parsers.cpp \ diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 55cab0400b..180060fd62 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -388,7 +388,6 @@ - @@ -408,7 +407,6 @@ - @@ -458,7 +456,6 @@ - @@ -486,7 +483,6 @@ - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 49e559580a..b3182870ac 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -34,9 +34,6 @@ gfx - - json - file @@ -148,9 +145,6 @@ thin3d - - json - net @@ -189,9 +183,6 @@ gfx - - json - file @@ -306,9 +297,6 @@ thin3d - - json - net @@ -338,9 +326,6 @@ {95e41110-57a2-497f-a938-b4c8e9dd6a27} - - {cda27e9f-5763-4bf2-b6bc-85a377f7020e} - {d738c2d1-749d-4b60-b98f-f3da0bbbf40c} diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp index d111f75461..a374e484e1 100644 --- a/ext/native/thin3d/thin3d_d3d11.cpp +++ b/ext/native/thin3d/thin3d_d3d11.cpp @@ -7,10 +7,11 @@ #include "thin3d/d3d11_loader.h" #endif #include "base/display.h" + #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Data/Encoding/Utf8.h" - #include "Common/ColorConv.h" +#include "Common/Log.h" #include #include diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 537cc03c70..0b5ecb7eef 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -10,9 +10,10 @@ #endif #include "base/NativeApp.h" -#include "file/zip_read.h" #include "profiler/profiler.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/FileUtil.h" #include "Common/GraphicsContext.h" #include "Common/TimeUtil.h" diff --git a/headless/StubHost.cpp b/headless/StubHost.cpp index 6569cc3b1a..a555a07816 100644 --- a/headless/StubHost.cpp +++ b/headless/StubHost.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/FileUtil.h" +#include "Common/Log.h" #include "Core/CoreParameter.h" #include "Core/System.h" #include "GPU/Common/GPUDebugInterface.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 774e0381ee..1bd8087ae0 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -14,24 +14,24 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "Common/TimeUtil.h" #include "file/zip_read.h" -#include "Common/Input/InputState.h" #include "net/resolve.h" #include "ui/screen.h" #include "thin3d/thin3d.h" #include "thin3d/thin3d_create.h" #include "thin3d/GLRenderManager.h" -#include "Common/Input/KeyCodes.h" #include "gfx_es2/gpu_features.h" +#include "Common/Log.h" +#include "Common/TimeUtil.h" +#include "Common/Input/InputState.h" +#include "Common/Input/KeyCodes.h" +#include "Common/GraphicsContext.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" #include "Core/HLE/sceUsbCam.h" #include "Core/HLE/sceUsbGps.h" -#include "Common/GraphicsContext.h" -#include "Common/Log.h" #include #include diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 8f7588e532..71095ccea5 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -150,18 +150,21 @@ SOURCES_CXX += \ $(COMMONDIR)/Data/Encoding/Utf8.cpp \ $(COMMONDIR)/Data/Format/RIFF.cpp \ $(COMMONDIR)/Data/Format/IniFile.cpp \ + $(COMMONDIR)/Data/Format/JSONReader.cpp \ + $(COMMONDIR)/Data/Format/JSONWriter.cpp \ $(COMMONDIR)/Data/Hash/Hash.cpp \ $(COMMONDIR)/Data/Text/I18n.cpp \ $(COMMONDIR)/Data/Text/Parsers.cpp \ $(COMMONDIR)/Data/Text/WrapText.cpp \ - -SOURCES_CXX += \ $(COMMONDIR)/File/VFS/VFS.cpp \ $(COMMONDIR)/File/VFS/AssetReader.cpp \ $(COMMONDIR)/File/DiskFree.cpp \ - $(COMMONDIR)/File/PathBrowser.cpp - -SOURCES_CXX += \ + $(COMMONDIR)/File/PathBrowser.cpp \ + $(COMMONDIR)/Math/curves.cpp \ + $(COMMONDIR)/Math/expression_parser.cpp \ + $(COMMONDIR)/Math/math_util.cpp \ + $(COMMONDIR)/Math/lin/vec3.cpp \ + $(COMMONDIR)/Math/lin/matrix4x4.cpp \ $(COMMONDIR)/Serialize/Serializer.cpp \ $(COMMONDIR)/Thread/Executor.cpp \ $(COMMONDIR)/Thread/ThreadUtil.cpp \ @@ -240,7 +243,6 @@ SOURCES_CXX += \ $(GPUDIR)/GLES/StateMappingGLES.cpp \ $(GPUDIR)/GLES/StencilBufferGLES.cpp \ $(EXTDIR)/native/base/display.cpp \ - $(EXTDIR)/native/json/json_reader.cpp \ $(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \ $(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \ $(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \ @@ -300,8 +302,7 @@ SOURCES_CXX += $(COMMONDIR)/MemArenaPosix.cpp \ $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp endif -SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ - $(NATIVEDIR)/file/fd_util.cpp \ +SOURCES_CXX += $(NATIVEDIR)/file/fd_util.cpp \ $(NATIVEDIR)/file/file_util.cpp \ $(NATIVEDIR)/gfx/gl_debug_log.cpp \ $(NATIVEDIR)/gfx/texture_atlas.cpp \ @@ -313,10 +314,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(NATIVEDIR)/gfx_es2/glsl_program.cpp \ $(NATIVEDIR)/image/zim_load.cpp \ $(NATIVEDIR)/image/png_load.cpp \ - $(NATIVEDIR)/math/curves.cpp \ - $(NATIVEDIR)/math/expression_parser.cpp \ - $(NATIVEDIR)/math/lin/matrix4x4.cpp \ - $(NATIVEDIR)/math/lin/vec3.cpp \ $(NATIVEDIR)/net/http_client.cpp \ $(NATIVEDIR)/net/resolve.cpp \ $(NATIVEDIR)/net/url.cpp \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index f0efc6437b..1a6e82ae49 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -22,7 +22,7 @@ #include "LogManager.h" #include "ConsoleListener.h" #include "Common/File/VFS/VFS.h" -#include "file/zip_read.h" +#include "Common/File/VFS/AssetReader.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" #include "GPU/Common/FramebufferManagerCommon.h" From 821817e6d4f74c82a7a23227f4e1c766dff5f5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 10:04:01 +0200 Subject: [PATCH 3/7] Move the profiler to Common --- CMakeLists.txt | 4 ++-- Common/Common.vcxproj | 2 ++ Common/Common.vcxproj.filters | 9 +++++++++ .../profiler.cpp => Common/Profiler/Profiler.cpp | 10 +++++----- .../profiler/profiler.h => Common/Profiler/Profiler.h | 0 Core/Core.cpp | 2 +- Core/CoreTiming.cpp | 2 +- Core/HLE/HLE.cpp | 2 +- Core/HLE/sceDisplay.cpp | 2 +- Core/HLE/sceIo.cpp | 2 +- Core/HLE/sceSas.cpp | 2 +- Core/HW/SasAudio.cpp | 2 +- Core/MIPS/ARM/ArmCompBranch.cpp | 2 +- Core/MIPS/ARM/ArmJit.cpp | 2 +- Core/MIPS/ARM64/Arm64CompBranch.cpp | 2 +- Core/MIPS/ARM64/Arm64Jit.cpp | 2 +- Core/MIPS/IR/IRCompBranch.cpp | 2 +- Core/MIPS/IR/IRJit.cpp | 2 +- Core/MIPS/MIPS/MipsJit.cpp | 2 +- Core/MIPS/x86/CompBranch.cpp | 2 +- Core/MIPS/x86/Jit.cpp | 2 +- GPU/Common/DrawEngineCommon.cpp | 2 +- GPU/Common/SplineCommon.cpp | 2 +- GPU/Common/TextureCacheCommon.cpp | 2 +- GPU/D3D11/GPU_D3D11.cpp | 2 +- GPU/Debugger/Playback.cpp | 2 +- GPU/Directx9/GPU_DX9.cpp | 2 +- GPU/Directx9/StateMappingDX9.cpp | 2 +- GPU/GLES/DrawEngineGLES.cpp | 2 +- GPU/GLES/FramebufferManagerGLES.cpp | 2 +- GPU/GLES/GPU_GLES.cpp | 2 +- GPU/GLES/ShaderManagerGLES.cpp | 2 +- GPU/GLES/StateMappingGLES.cpp | 2 +- GPU/GLES/TextureCacheGLES.cpp | 2 +- GPU/GPUCommon.cpp | 2 +- GPU/Software/Clipper.cpp | 2 +- GPU/Software/Rasterizer.cpp | 2 +- GPU/Software/RasterizerRectangle.cpp | 2 +- GPU/Software/SoftGpu.cpp | 2 +- GPU/Vulkan/DrawEngineVulkan.cpp | 2 +- GPU/Vulkan/FramebufferManagerVulkan.cpp | 2 +- GPU/Vulkan/GPU_Vulkan.cpp | 2 +- GPU/Vulkan/PipelineManagerVulkan.cpp | 2 +- GPU/Vulkan/ShaderManagerVulkan.cpp | 2 +- GPU/Vulkan/TextureCacheVulkan.cpp | 2 +- UI/DevScreens.cpp | 2 +- UI/EmuScreen.cpp | 2 +- UI/NativeApp.cpp | 2 +- UI/ProfilerDraw.cpp | 2 +- UWP/CommonUWP/CommonUWP.vcxproj | 2 ++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 9 +++++++++ Windows/main.cpp | 2 +- android/jni/Android.mk | 2 +- android/jni/app-android.cpp | 2 +- ext/native/native.vcxproj | 2 -- ext/native/native.vcxproj.filters | 9 --------- headless/Headless.cpp | 2 +- ios/main.mm | 2 +- 58 files changed, 78 insertions(+), 67 deletions(-) rename ext/native/profiler/profiler.cpp => Common/Profiler/Profiler.cpp (99%) rename ext/native/profiler/profiler.h => Common/Profiler/Profiler.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1244a96d4..414c9dd149 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -491,6 +491,8 @@ add_library(Common STATIC Common/Math/lin/vec3.h Common/Math/math_util.cpp Common/Math/math_util.h + Common/Profiler/Profiler.cpp + Common/Profiler/Profiler.h Common/Thread/Executor.cpp Common/Thread/Executor.h Common/Thread/PrioritizedWorkQueue.cpp @@ -1059,8 +1061,6 @@ add_library(native STATIC ext/native/net/url.h ext/native/net/websocket_server.cpp ext/native/net/websocket_server.h - ext/native/profiler/profiler.cpp - ext/native/profiler/profiler.h ext/native/thin3d/thin3d.cpp ext/native/thin3d/thin3d.h ext/native/thin3d/thin3d_create.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 99dc270595..6d8e13d2f8 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -393,6 +393,7 @@ + @@ -671,6 +672,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 2a3ba0cc61..1df3526c49 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -226,6 +226,9 @@ Data\Format + + Profiler + @@ -433,6 +436,9 @@ Data\Format + + Profiler + @@ -504,6 +510,9 @@ {b10822cf-4cc0-4bc3-91a9-b20cb66e5cbd} + + {8321632b-8fc5-4a67-adb7-126a328d50eb} + diff --git a/ext/native/profiler/profiler.cpp b/Common/Profiler/Profiler.cpp similarity index 99% rename from ext/native/profiler/profiler.cpp rename to Common/Profiler/Profiler.cpp index 50b36465c5..923a9aed62 100644 --- a/ext/native/profiler/profiler.cpp +++ b/Common/Profiler/Profiler.cpp @@ -5,14 +5,14 @@ #include #include #include +#include -#include +#include "ppsspp_config.h" + +#include "gfx_es2/draw_buffer.h" #include "Common/TimeUtil.h" -#include "gfx_es2/draw_buffer.h" -#include "ppsspp_config.h" -#include "profiler/profiler.h" - +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #define MAX_CATEGORIES 64 // Can be any number, represents max profiled names. diff --git a/ext/native/profiler/profiler.h b/Common/Profiler/Profiler.h similarity index 100% rename from ext/native/profiler/profiler.h rename to Common/Profiler/Profiler.h diff --git a/Core/Core.cpp b/Core/Core.cpp index 73d9ea35a2..e79e08e48d 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -26,7 +26,7 @@ #include "base/display.h" #include "Common/TimeUtil.h" #include "Common/Thread/ThreadUtil.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/GraphicsContext.h" #include "Common/Log.h" diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 81a7b3444d..ca30771568 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -20,7 +20,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeList.h" diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index c77962347d..eb4575fea6 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -20,7 +20,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 390d8f2621..1c82dfa0a6 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -27,7 +27,7 @@ #endif #include "Common/Data/Text/I18n.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 4f1185fffd..bdd93d5179 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -20,7 +20,7 @@ #include #include "Common/Thread/ThreadUtil.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 5205c9d22d..25cb02f392 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -32,7 +32,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Log.h" diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index 90f408b619..ea66611e0f 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/MemMapHelpers.h" diff --git a/Core/MIPS/ARM/ArmCompBranch.cpp b/Core/MIPS/ARM/ArmCompBranch.cpp index b92cca816a..af3fb645f6 100644 --- a/Core/MIPS/ARM/ArmCompBranch.cpp +++ b/Core/MIPS/ARM/ArmCompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index 5a8316f06b..653e1afe4c 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/MIPS/ARM64/Arm64CompBranch.cpp b/Core/MIPS/ARM64/Arm64CompBranch.cpp index 3e84996487..ce7bc2d341 100644 --- a/Core/MIPS/ARM64/Arm64CompBranch.cpp +++ b/Core/MIPS/ARM64/Arm64CompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/ARM64/Arm64Jit.cpp b/Core/MIPS/ARM64/Arm64Jit.cpp index 582cb7191e..cfdb3d0385 100644 --- a/Core/MIPS/ARM64/Arm64Jit.cpp +++ b/Core/MIPS/ARM64/Arm64Jit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/MIPS/IR/IRCompBranch.cpp b/Core/MIPS/IR/IRCompBranch.cpp index df23efa1e1..2592d6227c 100644 --- a/Core/MIPS/IR/IRCompBranch.cpp +++ b/Core/MIPS/IR/IRCompBranch.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 "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index 4324d3ba8f..77d988d139 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -18,7 +18,7 @@ #include #include "ext/xxhash.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/MIPS/MIPS/MipsJit.cpp b/Core/MIPS/MIPS/MipsJit.cpp index 0874282d50..5201437784 100644 --- a/Core/MIPS/MIPS/MipsJit.cpp +++ b/Core/MIPS/MIPS/MipsJit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(MIPS) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/MIPS/x86/CompBranch.cpp b/Core/MIPS/x86/CompBranch.cpp index b8816d4a12..8c8ce8fd3d 100644 --- a/Core/MIPS/x86/CompBranch.cpp +++ b/Core/MIPS/x86/CompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 21e57bf525..97682d5f7d 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -22,7 +22,7 @@ #include #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp index 994475d718..bb554d1c38 100644 --- a/GPU/Common/DrawEngineCommon.cpp +++ b/GPU/Common/DrawEngineCommon.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Core/Config.h" #include "GPU/Common/DrawEngineCommon.h" diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp index 2460af74dc..c4aa0d2c49 100644 --- a/GPU/Common/SplineCommon.cpp +++ b/GPU/Common/SplineCommon.cpp @@ -18,7 +18,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/CPUDetect.h" diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index b00d783338..03e6262940 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -18,7 +18,7 @@ #include #include "ppsspp_config.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Common/MemoryUtil.h" #include "Core/Config.h" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 27db9fd389..8199b3667c 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -40,7 +40,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" #include "Core/MemMapHelpers.h" diff --git a/GPU/Debugger/Playback.cpp b/GPU/Debugger/Playback.cpp index d05b14bc37..4a7fb9ca00 100644 --- a/GPU/Debugger/Playback.cpp +++ b/GPU/Debugger/Playback.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Common.h" #include "Common/Log.h" #include "Core/Core.h" diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 07aae4fadf..1b5be8e793 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -20,7 +20,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" #include "Core/MemMapHelpers.h" diff --git a/GPU/Directx9/StateMappingDX9.cpp b/GPU/Directx9/StateMappingDX9.cpp index e37c60eaef..0efeaf996e 100644 --- a/GPU/Directx9/StateMappingDX9.cpp +++ b/GPU/Directx9/StateMappingDX9.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 "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index 438bef2638..759f3541b5 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -26,7 +26,7 @@ #include "Core/CoreTiming.h" #include "gfx/gl_debug_log.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index f2709663cf..ac4faa624a 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/gl_common.h" #include "gfx/gl_debug_log.h" #include "gfx_es2/glsl_program.h" diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 0623af9e33..8fb872cc98 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.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 "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Common/Log.h" diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 68c7c6a5d1..d1ffc3fecc 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -29,7 +29,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/GLES/StateMappingGLES.cpp b/GPU/GLES/StateMappingGLES.cpp index 73a1805a59..8856bd517f 100644 --- a/GPU/GLES/StateMappingGLES.cpp +++ b/GPU/GLES/StateMappingGLES.cpp @@ -21,7 +21,7 @@ #include "StateMappingGLES.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/gl_debug_log.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index d700ff17ff..62844159a7 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -22,7 +22,7 @@ #include "gfx/gl_debug_log.h" #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/GLRenderManager.h" #include "Common/ColorConv.h" diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index da92f820c4..a77a8269ad 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -2,7 +2,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Common/GraphicsContext.h" diff --git a/GPU/Software/Clipper.cpp b/GPU/Software/Clipper.cpp index b462bd5977..66db9a08e4 100644 --- a/GPU/Software/Clipper.cpp +++ b/GPU/Software/Clipper.cpp @@ -23,7 +23,7 @@ #include "GPU/Software/Rasterizer.h" #include "GPU/Software/RasterizerRectangle.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" namespace Clipper { diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index 519d5b2e7c..7bfc9b190f 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -18,7 +18,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ThreadPools.h" #include "Common/ColorConv.h" diff --git a/GPU/Software/RasterizerRectangle.cpp b/GPU/Software/RasterizerRectangle.cpp index be2d042692..668a9476e3 100644 --- a/GPU/Software/RasterizerRectangle.cpp +++ b/GPU/Software/RasterizerRectangle.cpp @@ -3,7 +3,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/System.h" diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index d0d49548b9..33de98f955 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -32,7 +32,7 @@ #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "Core/Core.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "GPU/Software/Rasterizer.h" diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 52880e958a..2688698efd 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -18,7 +18,7 @@ #include #include "Common/Data/Convert/SmallDataConvert.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/VulkanRenderManager.h" #include "Common/Log.h" diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index 092f314514..eec77859cb 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "base/display.h" #include "Common/Math/lin/matrix4x4.h" diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 2b9724f127..96e4212ec8 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -18,7 +18,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/FileUtil.h" diff --git a/GPU/Vulkan/PipelineManagerVulkan.cpp b/GPU/Vulkan/PipelineManagerVulkan.cpp index df8446b6bb..23d39bb3bf 100644 --- a/GPU/Vulkan/PipelineManagerVulkan.cpp +++ b/GPU/Vulkan/PipelineManagerVulkan.cpp @@ -3,7 +3,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/StringUtils.h" diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index 2c277d7266..f8678a4dd8 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -22,7 +22,7 @@ #include "Common/Math/lin/matrix4x4.h" #include "Common/Math/math_util.h" #include "Common/Data/Convert/SmallDataConvert.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 0ff3400c1f..3e24a899c5 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -22,7 +22,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "thin3d/VulkanRenderManager.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index a577639e2a..0423002a36 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -26,7 +26,7 @@ #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/LogManager.h" #include "Common/CPUDetect.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index aa201f9a13..b848d699bc 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -21,7 +21,7 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/texture_atlas.h" #include "gfx_es2/gpu_features.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 2642576e7c..0eb2977cbc 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -55,7 +55,7 @@ #include "Common/Math/fast/fast_math.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "ui/ui.h" #include "ui/screen.h" diff --git a/UI/ProfilerDraw.cpp b/UI/ProfilerDraw.cpp index 8d7cf74021..8b8ce6838e 100644 --- a/UI/ProfilerDraw.cpp +++ b/UI/ProfilerDraw.cpp @@ -21,7 +21,7 @@ #include "gfx_es2/draw_buffer.h" #include "ui/ui_context.h" #include "ui/view.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" static const uint32_t nice_colors[] = { 0xFF8040, diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index de272962bf..9156bfa093 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -419,6 +419,7 @@ + @@ -505,6 +506,7 @@ + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 674947102e..58ec4db297 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -58,6 +58,9 @@ {b23bdba1-6007-4edb-ac75-a04cf8c5e172} + + {6673c122-d7ed-4ccc-969a-12d317ee1f93} + @@ -240,6 +243,9 @@ Data\Format + + Profiler + @@ -428,6 +434,9 @@ Data\Format + + Profiler + diff --git a/Windows/main.cpp b/Windows/main.cpp index 40e4acdc34..5d5464f284 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -36,7 +36,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/Data/Text/I18n.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" #include "net/resolve.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 8654dee504..9ef7d2b702 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -112,7 +112,6 @@ NATIVE_FILES :=\ $(SRC)/ext/native/net/sinks.cpp \ $(SRC)/ext/native/net/url.cpp \ $(SRC)/ext/native/net/websocket_server.cpp \ - $(SRC)/ext/native/profiler/profiler.cpp \ $(SRC)/ext/native/gfx_es2/glsl_program.cpp \ $(SRC)/ext/native/gfx_es2/gpu_features.cpp \ $(SRC)/ext/native/gfx_es2/gl3stub.c \ @@ -278,6 +277,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Math/expression_parser.cpp \ $(SRC)/Common/Math/lin/vec3.cpp.arm \ $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \ + $(SRC)/Common/Profiler/Profiler.cpp \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index b25ff4fdcd..57e2d4c7c6 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -56,7 +56,7 @@ struct JNIEnv {}; #include "Common/File/VFS/AssetReader.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Math/math_util.h" #include "net/resolve.h" #include "Common/Data/Text/Parsers.h" diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 180060fd62..7a4d64981e 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -412,7 +412,6 @@ - @@ -488,7 +487,6 @@ - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index b3182870ac..e11d74cf0e 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -28,9 +28,6 @@ gfx - - profiler - gfx @@ -177,9 +174,6 @@ gfx - - profiler - gfx @@ -317,9 +311,6 @@ {828bddaf-63e5-4311-985b-bf377f86ff00} - - {c57b41dd-cc33-46ac-b479-19676455ae54} - {49afd06e-eb44-41ac-b038-e109e444a834} diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 0b5ecb7eef..5d88aede92 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -10,7 +10,7 @@ #endif #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" diff --git a/ios/main.mm b/ios/main.mm index 4c9f004c5f..762d4e8ade 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -15,7 +15,7 @@ #import "ViewController.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #define CS_OPS_STATUS 0 /* return status */ #define CS_DEBUGGED 0x10000000 /* process is currently or has previously been debugged and allowed to run with invalid pages */ From b7edf754379f7e3a7d12412e63c75180e5195852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 10:10:55 +0200 Subject: [PATCH 4/7] Move Display.cpp/h to Common. --- CMakeLists.txt | 4 +-- Common/Common.vcxproj.filters | 3 ++ .../display.cpp => Common/System/Display.cpp | 2 +- .../base/display.h => Common/System/Display.h | 0 Common/Vulkan/VulkanContext.cpp | 2 +- Core/Config.cpp | 2 +- Core/Core.cpp | 2 +- GPU/Common/GPUStateUtils.cpp | 2 +- GPU/Common/PresentationCommon.cpp | 2 +- GPU/Common/ShaderUniforms.cpp | 2 +- GPU/D3D11/FramebufferManagerD3D11.cpp | 2 +- GPU/Software/SoftGpu.cpp | 2 +- GPU/Vulkan/FramebufferManagerVulkan.cpp | 2 +- Qt/QtMain.h | 2 +- Qt/mainwindow.cpp | 2 +- SDL/SDLGLGraphicsContext.cpp | 2 +- SDL/SDLMain.cpp | 2 +- SDL/SDLVulkanGraphicsContext.cpp | 2 +- UI/ComboKeyMappingScreen.cpp | 2 +- UI/ControlMappingScreen.cpp | 2 +- UI/DevScreens.cpp | 2 +- UI/DisplayLayoutScreen.cpp | 2 +- UI/EmuScreen.cpp | 2 +- UI/GPUDriverTestScreen.h | 2 +- UI/GameSettingsScreen.cpp | 2 +- UI/GamepadEmu.cpp | 2 +- UI/MainScreen.cpp | 2 +- UI/MiscScreens.cpp | 2 +- UI/NativeApp.cpp | 2 +- UI/ReportScreen.cpp | 2 +- UWP/CommonUWP/CommonUWP.vcxproj | 2 ++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 9 +++++ UWP/PPSSPP_UWPMain.cpp | 2 +- Windows/Debugger/CtrlDisAsmView.cpp | 2 +- Windows/Debugger/CtrlMemView.cpp | 2 +- Windows/Debugger/CtrlRegisterList.cpp | 2 +- Windows/Debugger/Debugger_MemoryDlg.cpp | 2 +- Windows/GEDebugger/CtrlDisplayListView.cpp | 2 +- Windows/GPU/D3D11Context.cpp | 2 +- Windows/GPU/D3D9Context.cpp | 2 +- Windows/MainWindow.cpp | 2 +- Windows/RawInput.cpp | 2 +- Windows/TouchInputHandler.cpp | 2 +- Windows/WindowsHost.cpp | 2 +- Windows/main.cpp | 2 +- android/jni/Android.mk | 2 +- android/jni/AndroidJavaGLContext.cpp | 2 +- android/jni/AndroidVulkanContext.cpp | 2 +- android/jni/TestRunner.cpp | 2 +- android/jni/app-android.cpp | 2 +- ext/native/gfx_es2/draw_buffer.cpp | 2 +- ext/native/gfx_es2/draw_text.cpp | 2 +- ext/native/gfx_es2/draw_text_android.cpp | 2 +- ext/native/gfx_es2/draw_text_qt.cpp | 2 +- ext/native/gfx_es2/draw_text_uwp.cpp | 2 +- ext/native/gfx_es2/draw_text_win.cpp | 2 +- ext/native/native.vcxproj | 33 ------------------- ext/native/native.vcxproj.filters | 18 ---------- ext/native/thin3d/VulkanRenderManager.h | 2 +- ext/native/thin3d/thin3d.cpp | 2 +- ext/native/thin3d/thin3d_d3d11.cpp | 2 +- ext/native/thin3d/thin3d_vulkan.cpp | 2 +- ext/native/ui/screen.cpp | 2 +- ext/native/ui/ui_context.cpp | 2 +- ext/native/ui/ui_screen.cpp | 2 +- ios/DisplayManager.mm | 2 +- ios/PPSSPPUIApplication.mm | 2 +- ios/ViewController.mm | 2 +- libretro/Makefile.common | 2 +- libretro/libretro.cpp | 22 ++++++++----- 70 files changed, 91 insertions(+), 124 deletions(-) rename ext/native/base/display.cpp => Common/System/Display.cpp (97%) rename ext/native/base/display.h => Common/System/Display.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 414c9dd149..0bdfe17939 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -493,6 +493,8 @@ add_library(Common STATIC Common/Math/math_util.h Common/Profiler/Profiler.cpp Common/Profiler/Profiler.h + Common/System/Display.cpp + Common/System/Display.h Common/Thread/Executor.cpp Common/Thread/Executor.h Common/Thread/PrioritizedWorkQueue.cpp @@ -1010,8 +1012,6 @@ endif() add_library(native STATIC ${nativeExtra} - ext/native/base/display.cpp - ext/native/base/display.h ext/native/file/fd_util.cpp ext/native/file/fd_util.h ext/native/file/file_util.cpp diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 1df3526c49..483144fcab 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -513,6 +513,9 @@ {8321632b-8fc5-4a67-adb7-126a328d50eb} + + {89ddf0bd-3fc4-4a69-87a7-b82cfc412e0a} + diff --git a/ext/native/base/display.cpp b/Common/System/Display.cpp similarity index 97% rename from ext/native/base/display.cpp rename to Common/System/Display.cpp index f90784b819..0e9c1ffb62 100644 --- a/ext/native/base/display.cpp +++ b/Common/System/Display.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Math/math_util.h" int dp_xres; diff --git a/ext/native/base/display.h b/Common/System/Display.h similarity index 100% rename from ext/native/base/display.h rename to Common/System/Display.h diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index 17fe8bb496..7e0338936d 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -5,7 +5,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Log.h" #include "Common/Vulkan/VulkanContext.h" #include "Common/Vulkan/VulkanDebug.h" diff --git a/Core/Config.cpp b/Core/Config.cpp index a1a3b31d34..89aeb90706 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -24,7 +24,7 @@ #include "ppsspp_config.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "net/http_client.h" diff --git a/Core/Core.cpp b/Core/Core.cpp index e79e08e48d..9748441e1a 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -23,7 +23,7 @@ #include #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/TimeUtil.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Profiler/Profiler.h" diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp index 62cd71757a..8ccf5b2764 100644 --- a/GPU/Common/GPUStateUtils.cpp +++ b/GPU/Common/GPUStateUtils.cpp @@ -18,7 +18,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/StringUtils.h" #include "Core/Config.h" diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index 0d74e0c661..d80394f55f 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -19,7 +19,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "thin3d/thin3d.h" diff --git a/GPU/Common/ShaderUniforms.cpp b/GPU/Common/ShaderUniforms.cpp index f266721050..46f6a93855 100644 --- a/GPU/Common/ShaderUniforms.cpp +++ b/GPU/Common/ShaderUniforms.cpp @@ -2,7 +2,7 @@ #include #include "ShaderUniforms.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Math/math_util.h" diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index 83a2beab65..f4d4854049 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -19,7 +19,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Math/lin/matrix4x4.h" #include "ext/native/thin3d/thin3d.h" diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index 33de98f955..6dd2fcd78f 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.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 "base/display.h" +#include "Common/System/Display.h" #include "gfx_es2/gpu_features.h" #include "GPU/GPUState.h" diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index eec77859cb..41e47ae259 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -19,7 +19,7 @@ #include "Common/Profiler/Profiler.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "ext/native/thin3d/thin3d.h" diff --git a/Qt/QtMain.h b/Qt/QtMain.h index 2fce102089..3a1cd3a750 100644 --- a/Qt/QtMain.h +++ b/Qt/QtMain.h @@ -22,7 +22,7 @@ QTM_USE_NAMESPACE #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/TimeUtil.h" #include "file/zip_read.h" #include "gfx/gl_common.h" diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index 544eaa93ed..fe48956f2e 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -7,7 +7,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Core/MIPS/MIPSDebugInterface.h" #include "Core/Debugger/SymbolMap.h" diff --git a/SDL/SDLGLGraphicsContext.cpp b/SDL/SDLGLGraphicsContext.cpp index b5650590b7..2d41fd1c4f 100644 --- a/SDL/SDLGLGraphicsContext.cpp +++ b/SDL/SDLGLGraphicsContext.cpp @@ -4,7 +4,7 @@ #include "Core/ConfigValues.h" #include "Core/System.h" #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "gfx_es2/gpu_features.h" #include "thin3d/thin3d_create.h" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index ffa534c3af..37b3ad12af 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -20,7 +20,7 @@ SDLJoystick *joystick = NULL; #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "ext/glslang/glslang/Public/ShaderLang.h" #include "image/png_load.h" diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp index 9bc9bf925b..77bb943ecc 100644 --- a/SDL/SDLVulkanGraphicsContext.cpp +++ b/SDL/SDLVulkanGraphicsContext.cpp @@ -1,7 +1,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "thin3d/thin3d_create.h" #include "thin3d/VulkanRenderManager.h" diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp index e407df4625..672b760df8 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/ComboKeyMappingScreen.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 "base/display.h" +#include "Common/System/Display.h" #include "gfx_es2/draw_buffer.h" #include "gfx/texture_atlas.h" #include "ui/ui_context.h" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 542a542f38..518d805292 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -19,7 +19,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" #include "ui/root.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 0423002a36..7f7bf849fd 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -18,7 +18,7 @@ #include #include "ppsspp_config.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "Common/Data/Text/I18n.h" diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 4ae30dd4ad..1df7c0d072 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -18,7 +18,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index b848d699bc..1856580ce8 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -19,7 +19,7 @@ #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/Profiler/Profiler.h" diff --git a/UI/GPUDriverTestScreen.h b/UI/GPUDriverTestScreen.h index a241e81bae..0f5de4a8b0 100644 --- a/UI/GPUDriverTestScreen.h +++ b/UI/GPUDriverTestScreen.h @@ -1,6 +1,6 @@ #pragma once -#include "base/display.h" +#include "Common/System/Display.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 9804387f7e..77ed61bed0 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -19,7 +19,7 @@ #include -#include "base/display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres +#include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres #include "base/NativeApp.h" #include "Common/Data/Color/RGBAUtil.h" diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index 0277c34592..8b4d4b8b4a 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -18,7 +18,7 @@ #include #include "Common/Data/Color/RGBAUtil.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" #include "Common/Math/math_util.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 645a4255cd..04aa540a49 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -20,7 +20,7 @@ #include "ppsspp_config.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 5a861c3d58..86bc8360b2 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -21,7 +21,7 @@ #include #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "gfx_es2/draw_buffer.h" #include "Common/Math/curves.h" #include "ui/ui_context.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 0eb2977cbc..b4bd291126 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -43,7 +43,7 @@ #include "Windows/CaptureDevice.h" #endif -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "net/http_client.h" #include "net/resolve.h" diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index 59765847f0..bf63825722 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -17,7 +17,7 @@ #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 9156bfa093..af2508dc88 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -453,6 +453,7 @@ + @@ -529,6 +530,7 @@ + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 58ec4db297..189cf456c9 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -61,6 +61,9 @@ {6673c122-d7ed-4ccc-969a-12d317ee1f93} + + {661f7d9d-5922-48d6-88ea-2f24bb57419f} + @@ -246,6 +249,9 @@ Profiler + + System + @@ -437,6 +443,9 @@ Profiler + + System + diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 6188606368..6f48714b88 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -7,7 +7,7 @@ #include "file/file_util.h" #include "net/http_client.h" #include "net/resolve.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d_create.h" #include "Common/Common.h" diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp index c37127f0dc..e26f9644d8 100644 --- a/Windows/Debugger/CtrlDisAsmView.cpp +++ b/Windows/Debugger/CtrlDisAsmView.cpp @@ -22,7 +22,7 @@ #include "Common/CommonWindows.h" #include "Common/Data/Encoding/Utf8.h" #include "ext/xxhash.h" -#include "base/display.h" +#include "Common/System/Display.h" #include #include diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp index 4dda0822e1..7ae71ef331 100644 --- a/Windows/Debugger/CtrlMemView.cpp +++ b/Windows/Debugger/CtrlMemView.cpp @@ -9,7 +9,7 @@ #include "Windows/W32Util/Misc.h" #include "Windows/InputBox.h" #include "Windows/main.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Debugger_Disasm.h" #include "DebuggerShared.h" diff --git a/Windows/Debugger/CtrlRegisterList.cpp b/Windows/Debugger/CtrlRegisterList.cpp index 791838cdd3..02992e5f28 100644 --- a/Windows/Debugger/CtrlRegisterList.cpp +++ b/Windows/Debugger/CtrlRegisterList.cpp @@ -3,7 +3,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Encoding/Utf8.h" #include "Windows/resource.h" #include "Core/MemMap.h" diff --git a/Windows/Debugger/Debugger_MemoryDlg.cpp b/Windows/Debugger/Debugger_MemoryDlg.cpp index 9604616f01..3302786160 100644 --- a/Windows/Debugger/Debugger_MemoryDlg.cpp +++ b/Windows/Debugger/Debugger_MemoryDlg.cpp @@ -4,7 +4,7 @@ #include #include "..\resource.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Encoding/Utf8.h" #include "Core/Debugger/SymbolMap.h" diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp index 741ca4b3af..78b3373a5e 100644 --- a/Windows/GEDebugger/CtrlDisplayListView.cpp +++ b/Windows/GEDebugger/CtrlDisplayListView.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "Windows/GEDebugger/CtrlDisplayListView.h" #include "Windows/GEDebugger/GEDebugger.h" #include "Windows/InputBox.h" diff --git a/Windows/GPU/D3D11Context.cpp b/Windows/GPU/D3D11Context.cpp index 9ced64d60c..32d158c54e 100644 --- a/Windows/GPU/D3D11Context.cpp +++ b/Windows/GPU/D3D11Context.cpp @@ -5,7 +5,7 @@ #include #include "Common/Log.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Data/Text/I18n.h" diff --git a/Windows/GPU/D3D9Context.cpp b/Windows/GPU/D3D9Context.cpp index be91557b47..daeb0fd86b 100644 --- a/Windows/GPU/D3D9Context.cpp +++ b/Windows/GPU/D3D9Context.cpp @@ -5,7 +5,7 @@ #include "gfx/d3d9_state.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Data/Text/I18n.h" diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 3178e1adfe..560073b65e 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -31,7 +31,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp index 9d7f9ba79a..6f8071058f 100644 --- a/Windows/RawInput.cpp +++ b/Windows/RawInput.cpp @@ -20,7 +20,7 @@ #include #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Input/InputState.h" #include "Common/Log.h" #include "Windows/RawInput.h" diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp index b052ed3fa9..1066e04c85 100644 --- a/Windows/TouchInputHandler.cpp +++ b/Windows/TouchInputHandler.cpp @@ -4,7 +4,7 @@ #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/CommonWindows.h" diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 3269917f10..02d28ff3d6 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -32,7 +32,7 @@ #pragma warning(pop) // native stuff -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "file/file_util.h" #include "Common/Input/InputState.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index 5d5464f284..c05d717714 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -31,7 +31,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 9ef7d2b702..2277a40f41 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -102,7 +102,6 @@ ARCH_FILES := \ endif NATIVE_FILES :=\ - $(SRC)/ext/native/base/display.cpp \ $(SRC)/ext/native/file/fd_util.cpp \ $(SRC)/ext/native/file/file_util.cpp \ $(SRC)/ext/native/net/http_client.cpp \ @@ -278,6 +277,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Math/lin/vec3.cpp.arm \ $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \ $(SRC)/Common/Profiler/Profiler.cpp \ + $(SRC)/Common/System/Display.cpp \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ diff --git a/android/jni/AndroidJavaGLContext.cpp b/android/jni/AndroidJavaGLContext.cpp index ffd5564494..d11feaf5a9 100644 --- a/android/jni/AndroidJavaGLContext.cpp +++ b/android/jni/AndroidJavaGLContext.cpp @@ -1,5 +1,5 @@ #include "AndroidJavaGLContext.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "Common/Log.h" diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp index 49eb548c2d..6de6dc5cf7 100644 --- a/android/jni/AndroidVulkanContext.cpp +++ b/android/jni/AndroidVulkanContext.cpp @@ -1,6 +1,6 @@ #include "AndroidVulkanContext.h" #include "base/NativeApp.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Log.h" #include "Common/Vulkan/VulkanContext.h" #include "Common/Vulkan/VulkanDebug.h" diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp index b7ca679ed5..8bc9809d7b 100644 --- a/android/jni/TestRunner.cpp +++ b/android/jni/TestRunner.cpp @@ -26,7 +26,7 @@ #include #include "ppsspp_config.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/FileUtil.h" #include "Common/Log.h" diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 57e2d4c7c6..e60f6bc01c 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -49,7 +49,7 @@ struct JNIEnv {}; #define JNI_VERSION_1_6 16 #endif -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/Thread/ThreadUtil.h" #include "Common/File/VFS/VFS.h" diff --git a/ext/native/gfx_es2/draw_buffer.cpp b/ext/native/gfx_es2/draw_buffer.cpp index a5c0e5a7a6..a31f938584 100644 --- a/ext/native/gfx_es2/draw_buffer.cpp +++ b/ext/native/gfx_es2/draw_buffer.cpp @@ -3,7 +3,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Math/math_util.h" #include "gfx/texture_atlas.h" #include "gfx/gl_debug_log.h" diff --git a/ext/native/gfx_es2/draw_text.cpp b/ext/native/gfx_es2/draw_text.cpp index c8d5d374d1..b1fae13c8e 100644 --- a/ext/native/gfx_es2/draw_text.cpp +++ b/ext/native/gfx_es2/draw_text.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Data/Hash/Hash.h" #include "Common/Data/Text/WrapText.h" diff --git a/ext/native/gfx_es2/draw_text_android.cpp b/ext/native/gfx_es2/draw_text_android.cpp index c824c0cd48..c19f859cf7 100644 --- a/ext/native/gfx_es2/draw_text_android.cpp +++ b/ext/native/gfx_es2/draw_text_android.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Data/Hash/Hash.h" #include "Common/Data/Text/WrapText.h" diff --git a/ext/native/gfx_es2/draw_text_qt.cpp b/ext/native/gfx_es2/draw_text_qt.cpp index f522e2c993..56b8c6e56c 100644 --- a/ext/native/gfx_es2/draw_text_qt.cpp +++ b/ext/native/gfx_es2/draw_text_qt.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Data/Hash/Hash.h" #include "Common/Data/Text/WrapText.h" diff --git a/ext/native/gfx_es2/draw_text_uwp.cpp b/ext/native/gfx_es2/draw_text_uwp.cpp index 3171b01608..71e88f0fd5 100644 --- a/ext/native/gfx_es2/draw_text_uwp.cpp +++ b/ext/native/gfx_es2/draw_text_uwp.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Data/Hash/Hash.h" #include "Common/Data/Text/WrapText.h" diff --git a/ext/native/gfx_es2/draw_text_win.cpp b/ext/native/gfx_es2/draw_text_win.cpp index 320d2968f3..1767d71cfa 100644 --- a/ext/native/gfx_es2/draw_text_win.cpp +++ b/ext/native/gfx_es2/draw_text_win.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Data/Hash/Hash.h" #include "Common/Data/Text/WrapText.h" diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 7a4d64981e..7e8a930e49 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -360,22 +360,10 @@ - - true - true - true - true - true - true - true - true - - - @@ -424,27 +412,6 @@ - - - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index e11d74cf0e..76060179e4 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -5,9 +5,6 @@ tools - - base - @@ -37,9 +34,6 @@ base - - base - ui @@ -127,9 +121,6 @@ ui - - base - thin3d @@ -180,9 +171,6 @@ file - - base - ui @@ -240,12 +228,6 @@ net - - base - - - base - thin3d diff --git a/ext/native/thin3d/VulkanRenderManager.h b/ext/native/thin3d/VulkanRenderManager.h index 60a99d4cc3..653fbae850 100644 --- a/ext/native/thin3d/VulkanRenderManager.h +++ b/ext/native/thin3d/VulkanRenderManager.h @@ -10,7 +10,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Vulkan/VulkanContext.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Math/math_util.h" diff --git a/ext/native/thin3d/thin3d.cpp b/ext/native/thin3d/thin3d.cpp index aabb1d818b..f15e96fa93 100644 --- a/ext/native/thin3d/thin3d.cpp +++ b/ext/native/thin3d/thin3d.cpp @@ -2,7 +2,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "Common/Log.h" #include "Common/ColorConv.h" diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp index a374e484e1..d39813667f 100644 --- a/ext/native/thin3d/thin3d_d3d11.cpp +++ b/ext/native/thin3d/thin3d_d3d11.cpp @@ -6,7 +6,7 @@ #else #include "thin3d/d3d11_loader.h" #endif -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 7195bc7bf4..2060f2d978 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -20,7 +20,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "image/zim_load.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Data/Convert/SmallDataConvert.h" diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp index 86b1dc02c4..97f5f2c567 100644 --- a/ext/native/ui/screen.cpp +++ b/ext/native/ui/screen.cpp @@ -1,4 +1,4 @@ -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Input/InputState.h" #include "ui/root.h" #include "ui/screen.h" diff --git a/ext/native/ui/ui_context.cpp b/ext/native/ui/ui_context.cpp index 6b4aa25cd4..052332f0bd 100644 --- a/ext/native/ui/ui_context.cpp +++ b/ext/native/ui/ui_context.cpp @@ -2,7 +2,7 @@ #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "ui/ui.h" #include "ui/view.h" diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp index 3e96d79c39..8ba6eb2bb0 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/ext/native/ui/ui_screen.cpp @@ -2,7 +2,7 @@ #include #include -#include "base/display.h" +#include "Common/System/Display.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "Common/Math/curves.h" diff --git a/ios/DisplayManager.mm b/ios/DisplayManager.mm index 495353a6df..e3ae0a7b66 100644 --- a/ios/DisplayManager.mm +++ b/ios/DisplayManager.mm @@ -8,7 +8,7 @@ #import "DisplayManager.h" #import "ViewController.h" #import "AppDelegate.h" -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Core/System.h" #import diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index 65a24d3c64..4beb622c44 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -12,7 +12,7 @@ #import #import -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "Common/TimeUtil.h" #include "file/zip_read.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 1bd8087ae0..6e702ba12c 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -12,7 +12,7 @@ #import #include -#include "base/display.h" +#include "Common/System/Display.h" #include "base/NativeApp.h" #include "file/zip_read.h" #include "net/resolve.h" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 71095ccea5..d0a534c6c9 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -170,6 +170,7 @@ SOURCES_CXX += \ $(COMMONDIR)/Thread/ThreadUtil.cpp \ $(COMMONDIR)/Thread/ThreadPool.cpp \ $(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \ + $(COMMONDIR)/System/Display.cpp \ $(COMMONDIR)/Input/GestureDetector.cpp \ $(COMMONDIR)/Input/InputState.cpp \ $(COMMONDIR)/Buffer.cpp \ @@ -242,7 +243,6 @@ SOURCES_CXX += \ $(GPUDIR)/GLES/ShaderManagerGLES.cpp \ $(GPUDIR)/GLES/StateMappingGLES.cpp \ $(GPUDIR)/GLES/StencilBufferGLES.cpp \ - $(EXTDIR)/native/base/display.cpp \ $(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \ $(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \ $(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 1a6e82ae49..219432057e 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -3,11 +3,22 @@ #include #include #include -#include +#include +#include "base/NativeApp.h" + +#include "Common/Log.h" +#include "Common/LogManager.h" +#include "Common/System/Display.h" #include "Common/TimeUtil.h" #include "Common/FileUtil.h" #include "Common/Serialize/Serializer.h" +#include "Common/ConsoleListener.h" +#include "Common/Input/InputState.h" +#include "Common/Thread/ThreadUtil.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" + #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Core.h" @@ -18,18 +29,11 @@ #include "Core/Host.h" #include "Core/MemMap.h" #include "Core/System.h" -#include "Log.h" -#include "LogManager.h" -#include "ConsoleListener.h" -#include "Common/File/VFS/VFS.h" -#include "Common/File/VFS/AssetReader.h" + #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureScalerCommon.h" -#include "Common/Input/InputState.h" -#include "base/NativeApp.h" -#include "Common/Thread/ThreadUtil.h" #include "libretro/libretro.h" #include "libretro/LibretroGraphicsContext.h" From f01ba6dc846ea00cf853def01c57b222d47cf29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 10:30:18 +0200 Subject: [PATCH 5/7] Move NativeApp.h to Common/System, split into NativeApp.h and System.h Buildfix --- CMakeLists.txt | 1 - Common/Common.vcxproj | 4 + Common/Common.vcxproj.filters | 12 +++ Common/Data/Format/RIFF.cpp | 2 + Common/Data/Format/RIFF.h | 1 - Common/MemArenaAndroid.cpp | 2 +- Common/MemArenaPosix.cpp | 7 +- .../native/base => Common/System}/NativeApp.h | 98 ----------------- Common/System/System.h | 101 ++++++++++++++++++ Common/Vulkan/VulkanLoader.cpp | 2 +- Core/Config.cpp | 4 +- Core/Core.cpp | 3 +- Core/Dialog/PSPOskDialog.cpp | 7 +- Core/HLE/sceDisplay.cpp | 7 +- Core/HLE/sceUsbCam.cpp | 2 +- Core/HLE/sceUsbGps.cpp | 3 +- Core/HW/StereoResampler.cpp | 2 +- Core/KeyMap.cpp | 3 +- Core/System.cpp | 2 +- GPU/Common/PresentationCommon.cpp | 4 +- GPU/D3D11/GPU_D3D11.cpp | 2 +- GPU/Directx9/GPU_DX9.cpp | 2 +- Qt/QtMain.cpp | 3 +- Qt/QtMain.h | 3 +- Qt/mainwindow.cpp | 3 +- Qt/mainwindow.h | 3 +- SDL/SDLGLGraphicsContext.cpp | 12 ++- SDL/SDLJoystick.cpp | 3 +- SDL/SDLMain.cpp | 3 +- SDL/SDLVulkanGraphicsContext.cpp | 5 +- UI/ChatScreen.cpp | 2 +- UI/ControlMappingScreen.cpp | 6 +- UI/CwCheatScreen.cpp | 2 +- UI/DevScreens.cpp | 3 +- UI/DisplayLayoutScreen.cpp | 2 +- UI/EmuScreen.cpp | 10 +- UI/GameScreen.cpp | 3 +- UI/GameSettingsScreen.cpp | 15 +-- UI/GamepadEmu.cpp | 2 +- UI/MainScreen.cpp | 2 +- UI/MiscScreens.cpp | 8 +- UI/NativeApp.cpp | 20 ++-- UI/PauseScreen.cpp | 7 +- UI/RemoteISOScreen.cpp | 2 +- UI/ReportScreen.cpp | 4 +- UWP/App.cpp | 3 +- UWP/CommonUWP/CommonUWP.vcxproj | 2 + UWP/CommonUWP/CommonUWP.vcxproj.filters | 6 ++ UWP/NativeUWP/NativeUWP.vcxproj | 3 - UWP/NativeUWP/NativeUWP.vcxproj.filters | 12 --- UWP/PPSSPP_UWPMain.cpp | 5 +- UWP/UWPHost.cpp | 3 +- Windows/DinputDevice.cpp | 2 +- Windows/EmuThread.cpp | 7 +- Windows/MainWindow.cpp | 3 +- Windows/MainWindowMenu.cpp | 7 +- Windows/RawInput.cpp | 2 +- Windows/TouchInputHandler.cpp | 2 +- Windows/WindowsHost.cpp | 2 +- Windows/XinputDevice.cpp | 2 +- Windows/main.cpp | 3 +- android/ab.cmd | 4 +- android/jni/AndroidEGLContext.cpp | 2 +- android/jni/AndroidJavaGLContext.cpp | 1 - android/jni/AndroidVulkanContext.cpp | 3 +- android/jni/app-android.cpp | 12 ++- ext/native/native.vcxproj | 1 - ext/native/native.vcxproj.filters | 6 -- ext/native/ui/ui_context.cpp | 2 +- ext/native/ui/view.cpp | 3 +- headless/Headless.cpp | 3 +- headless/SDLHeadlessHost.cpp | 4 +- ios/AppDelegate.mm | 3 +- ios/DisplayManager.mm | 3 +- ios/PPSSPPUIApplication.mm | 6 +- ios/ViewController.mm | 8 +- ios/main.mm | 3 +- libretro/libretro.cpp | 4 +- unittest/JitHarness.cpp | 4 +- unittest/UnitTest.cpp | 5 +- 80 files changed, 289 insertions(+), 246 deletions(-) rename {ext/native/base => Common/System}/NativeApp.h (55%) create mode 100644 Common/System/System.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bdfe17939..2daab5c16f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -814,7 +814,6 @@ if(ANDROID) ) set(NativeAppSource ${NativeAppSource} - ext/native/base/NativeApp.h android/jni/app-android.cpp android/jni/AndroidEGLContext.cpp android/jni/AndroidEGLContext.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 6d8e13d2f8..e319b38ae2 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -451,6 +451,9 @@ + + + @@ -722,6 +725,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 483144fcab..397028e32a 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -229,6 +229,15 @@ Profiler + + System + + + System + + + System + @@ -439,6 +448,9 @@ Profiler + + System + diff --git a/Common/Data/Format/RIFF.cpp b/Common/Data/Format/RIFF.cpp index 2ef0576fde..2b6056a125 100644 --- a/Common/Data/Format/RIFF.cpp +++ b/Common/Data/Format/RIFF.cpp @@ -1,3 +1,5 @@ +#include + #include "Common/Log.h" #include "Common/Data/Format/RIFF.h" diff --git a/Common/Data/Format/RIFF.h b/Common/Data/Format/RIFF.h index ab1b5c020f..0e0dbee623 100644 --- a/Common/Data/Format/RIFF.h +++ b/Common/Data/Format/RIFF.h @@ -10,7 +10,6 @@ // otherwise the scheme breaks. #include -#include #include class RIFFReader { diff --git a/Common/MemArenaAndroid.cpp b/Common/MemArenaAndroid.cpp index 462d1a3a94..c304f86435 100644 --- a/Common/MemArenaAndroid.cpp +++ b/Common/MemArenaAndroid.cpp @@ -27,11 +27,11 @@ #include #include -#include "base/NativeApp.h" #include "Common/Log.h" #include "Common/MemoryUtil.h" #include "Common/MemArena.h" #include "Common/StringUtils.h" +#include "Common/System/System.h" // Hopefully this ABI will never change... diff --git a/Common/MemArenaPosix.cpp b/Common/MemArenaPosix.cpp index 566af59ce4..016be57ce5 100644 --- a/Common/MemArenaPosix.cpp +++ b/Common/MemArenaPosix.cpp @@ -21,9 +21,10 @@ #include -#include "FileUtil.h" -#include "MemoryUtil.h" -#include "MemArena.h" +#include "Common/FileUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/MemArena.h" +#include "Common/Log.h" #include #include diff --git a/ext/native/base/NativeApp.h b/Common/System/NativeApp.h similarity index 55% rename from ext/native/base/NativeApp.h rename to Common/System/NativeApp.h index 3242bfa019..d501d03b43 100644 --- a/ext/native/base/NativeApp.h +++ b/Common/System/NativeApp.h @@ -2,7 +2,6 @@ #include #include -#include // The Native App API. // @@ -17,17 +16,6 @@ struct AxisInput; class GraphicsContext; -enum SystemPermission { - SYSTEM_PERMISSION_STORAGE, -}; - -enum PermissionStatus { - PERMISSION_STATUS_UNKNOWN, - PERMISSION_STATUS_DENIED, - PERMISSION_STATUS_PENDING, - PERMISSION_STATUS_GRANTED, -}; - // The first function to get called, just write strings to the two pointers. // This might get called multiple times in some implementations, you must be able to handle that. void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, bool *landscape, std::string *version); @@ -101,89 +89,3 @@ void NativeSetMixer(void* mixer); // Main thread. void NativeShutdownGraphics(); void NativeShutdown(); - -// Calls back into Java / SDL -// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp). -// You are free to call these. -void SystemToast(const char *text); -void ShowKeyboard(); - -// Vibrate either takes a number of milliseconds to vibrate unconditionally, -// or you can specify these constants for "standard" feedback. On Android, -// these will only be performed if haptic feedback is enabled globally. -// Also, on Android, these will work even if you don't have the VIBRATE permission, -// while generic vibration will not if you don't have it. -enum { - HAPTIC_SOFT_KEYBOARD = -1, - HAPTIC_VIRTUAL_KEY = -2, - HAPTIC_LONG_PRESS_ACTIVATED = -3, -}; -void Vibrate(int length_ms); -void OpenDirectory(const char *path); -void LaunchBrowser(const char *url); -void LaunchMarket(const char *url); -void LaunchEmail(const char *email_address); -void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function cb); -void System_SendMessage(const char *command, const char *parameter); -PermissionStatus System_GetPermissionStatus(SystemPermission permission); -void System_AskForPermission(SystemPermission permission); - -// This will get muddy with multi-screen support :/ But this will always be the type of the main device. -enum SystemDeviceType { - DEVICE_TYPE_MOBILE = 0, // phones and pads - DEVICE_TYPE_TV = 1, // Android TV and similar - DEVICE_TYPE_DESKTOP = 2, // Desktop computer -}; - -enum SystemProperty { - SYSPROP_NAME, - SYSPROP_LANGREGION, - SYSPROP_CPUINFO, - SYSPROP_BOARDNAME, - SYSPROP_CLIPBOARD_TEXT, - SYSPROP_GPUDRIVER_VERSION, - - SYSPROP_HAS_FILE_BROWSER, - SYSPROP_HAS_IMAGE_BROWSER, - SYSPROP_HAS_BACK_BUTTON, - - // Available as Int: - SYSPROP_SYSTEMVERSION, - SYSPROP_DISPLAY_XRES, - SYSPROP_DISPLAY_YRES, - SYSPROP_DISPLAY_REFRESH_RATE, - SYSPROP_DISPLAY_LOGICAL_DPI, - SYSPROP_DISPLAY_DPI, - SYSPROP_DISPLAY_COUNT, - SYSPROP_MOGA_VERSION, - - // Float only: - SYSPROP_DISPLAY_SAFE_INSET_LEFT, - SYSPROP_DISPLAY_SAFE_INSET_RIGHT, - SYSPROP_DISPLAY_SAFE_INSET_TOP, - SYSPROP_DISPLAY_SAFE_INSET_BOTTOM, - - SYSPROP_DEVICE_TYPE, - SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar. - - // Exposed on Android. Choosing the optimal sample rate for audio - // will result in lower latencies. Buffer size is automatically matched - // by the OpenSL audio backend, only exposed here for debugging/info. - SYSPROP_AUDIO_SAMPLE_RATE, - SYSPROP_AUDIO_FRAMES_PER_BUFFER, - SYSPROP_AUDIO_OPTIMAL_SAMPLE_RATE, - SYSPROP_AUDIO_OPTIMAL_FRAMES_PER_BUFFER, - - // Exposed on SDL. - SYSPROP_AUDIO_DEVICE_LIST, - - SYSPROP_SUPPORTS_PERMISSIONS, - SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE, -}; - -std::string System_GetProperty(SystemProperty prop); -int System_GetPropertyInt(SystemProperty prop); -float System_GetPropertyFloat(SystemProperty prop); -bool System_GetPropertyBool(SystemProperty prop); - -std::vector __cameraGetDeviceList(); diff --git a/Common/System/System.h b/Common/System/System.h new file mode 100644 index 0000000000..2d87f7399d --- /dev/null +++ b/Common/System/System.h @@ -0,0 +1,101 @@ +#pragma once + +#include +#include +#include + +enum SystemPermission { + SYSTEM_PERMISSION_STORAGE, +}; + +enum PermissionStatus { + PERMISSION_STATUS_UNKNOWN, + PERMISSION_STATUS_DENIED, + PERMISSION_STATUS_PENDING, + PERMISSION_STATUS_GRANTED, +}; + +// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp). +// Ideally these should be safe to call from any thread. +void SystemToast(const char *text); +void ShowKeyboard(); + +// Vibrate either takes a number of milliseconds to vibrate unconditionally, +// or you can specify these constants for "standard" feedback. On Android, +// these will only be performed if haptic feedback is enabled globally. +// Also, on Android, these will work even if you don't have the VIBRATE permission, +// while generic vibration will not if you don't have it. +enum { + HAPTIC_SOFT_KEYBOARD = -1, + HAPTIC_VIRTUAL_KEY = -2, + HAPTIC_LONG_PRESS_ACTIVATED = -3, +}; +void Vibrate(int length_ms); +void OpenDirectory(const char *path); +void LaunchBrowser(const char *url); +void LaunchMarket(const char *url); +void LaunchEmail(const char *email_address); +void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function cb); +void System_SendMessage(const char *command, const char *parameter); +PermissionStatus System_GetPermissionStatus(SystemPermission permission); +void System_AskForPermission(SystemPermission permission); + +// This will get muddy with multi-screen support :/ But this will always be the type of the main device. +enum SystemDeviceType { + DEVICE_TYPE_MOBILE = 0, // phones and pads + DEVICE_TYPE_TV = 1, // Android TV and similar + DEVICE_TYPE_DESKTOP = 2, // Desktop computer +}; + +enum SystemProperty { + SYSPROP_NAME, + SYSPROP_LANGREGION, + SYSPROP_CPUINFO, + SYSPROP_BOARDNAME, + SYSPROP_CLIPBOARD_TEXT, + SYSPROP_GPUDRIVER_VERSION, + + SYSPROP_HAS_FILE_BROWSER, + SYSPROP_HAS_IMAGE_BROWSER, + SYSPROP_HAS_BACK_BUTTON, + + // Available as Int: + SYSPROP_SYSTEMVERSION, + SYSPROP_DISPLAY_XRES, + SYSPROP_DISPLAY_YRES, + SYSPROP_DISPLAY_REFRESH_RATE, + SYSPROP_DISPLAY_LOGICAL_DPI, + SYSPROP_DISPLAY_DPI, + SYSPROP_DISPLAY_COUNT, + SYSPROP_MOGA_VERSION, + + // Float only: + SYSPROP_DISPLAY_SAFE_INSET_LEFT, + SYSPROP_DISPLAY_SAFE_INSET_RIGHT, + SYSPROP_DISPLAY_SAFE_INSET_TOP, + SYSPROP_DISPLAY_SAFE_INSET_BOTTOM, + + SYSPROP_DEVICE_TYPE, + SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar. + + // Exposed on Android. Choosing the optimal sample rate for audio + // will result in lower latencies. Buffer size is automatically matched + // by the OpenSL audio backend, only exposed here for debugging/info. + SYSPROP_AUDIO_SAMPLE_RATE, + SYSPROP_AUDIO_FRAMES_PER_BUFFER, + SYSPROP_AUDIO_OPTIMAL_SAMPLE_RATE, + SYSPROP_AUDIO_OPTIMAL_FRAMES_PER_BUFFER, + + // Exposed on SDL. + SYSPROP_AUDIO_DEVICE_LIST, + + SYSPROP_SUPPORTS_PERMISSIONS, + SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE, +}; + +std::string System_GetProperty(SystemProperty prop); +int System_GetPropertyInt(SystemProperty prop); +float System_GetPropertyFloat(SystemProperty prop); +bool System_GetPropertyBool(SystemProperty prop); + +std::vector __cameraGetDeviceList(); diff --git a/Common/Vulkan/VulkanLoader.cpp b/Common/Vulkan/VulkanLoader.cpp index b70259c610..0a58291277 100644 --- a/Common/Vulkan/VulkanLoader.cpp +++ b/Common/Vulkan/VulkanLoader.cpp @@ -21,7 +21,7 @@ #include #include "Common/Log.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #ifndef _WIN32 #include diff --git a/Core/Config.cpp b/Core/Config.cpp index 89aeb90706..3a98ae836f 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -24,8 +24,6 @@ #include "ppsspp_config.h" -#include "Common/System/Display.h" -#include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "net/http_client.h" #include "net/url.h" @@ -39,6 +37,8 @@ #include "Common/FileUtil.h" #include "Common/LogManager.h" #include "Common/OSVersion.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" #include "Common/StringUtils.h" #include "Common/Vulkan/VulkanLoader.h" #include "Core/Config.h" diff --git a/Core/Core.cpp b/Core/Core.cpp index 9748441e1a..f3cdd9b624 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -22,7 +22,8 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/System/Display.h" #include "Common/TimeUtil.h" #include "Common/Thread/ThreadUtil.h" diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index add21d1cdd..c049225f02 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -16,12 +16,14 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "base/NativeApp.h" + #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" #include "Common/Data/Encoding/Utf8.h" - #include "Common/Serialize/SerializeFuncs.h" +#include "Common/System/System.h" +#include "Common/Serialize/Serializer.h" + #include "Core/Dialog/PSPOskDialog.h" #include "Core/Util/PPGeDraw.h" #include "Core/HLE/sceCtrl.h" @@ -29,7 +31,6 @@ #include "Core/HLE/sceUtility.h" #include "Core/Config.h" #include "Core/Reporting.h" -#include "Common/Serialize/Serializer.h" #include "GPU/GPUState.h" #ifndef _WIN32 diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 1c82dfa0a6..6df19c4cea 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -26,12 +26,11 @@ #include #endif -#include "Common/Data/Text/I18n.h" -#include "Common/Profiler/Profiler.h" - -#include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Profiler/Profiler.h" +#include "Common/System/System.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeMap.h" diff --git a/Core/HLE/sceUsbCam.cpp b/Core/HLE/sceUsbCam.cpp index 7de78168ee..7793e372a0 100644 --- a/Core/HLE/sceUsbCam.cpp +++ b/Core/HLE/sceUsbCam.cpp @@ -20,7 +20,7 @@ #include "ppsspp_config.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/HLE/HLE.h" diff --git a/Core/HLE/sceUsbGps.cpp b/Core/HLE/sceUsbGps.cpp index 3d014318ac..723e83d445 100644 --- a/Core/HLE/sceUsbGps.cpp +++ b/Core/HLE/sceUsbGps.cpp @@ -16,7 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "base/NativeApp.h" + +#include "Common/System/System.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/HLE/HLE.h" diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp index c1e9b00049..898f21b48c 100644 --- a/Core/HW/StereoResampler.cpp +++ b/Core/HW/StereoResampler.cpp @@ -35,7 +35,7 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "Common/MathUtil.h" #include "Common/Serialize/Serializer.h" #include "Common/Log.h" diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp index 20d04b9599..8d94087708 100644 --- a/Core/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -26,7 +26,8 @@ #include "ppsspp_config.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Data/Format/IniFile.h" #include "Common/Input/InputState.h" #include "Common/Log.h" diff --git a/Core/System.cpp b/Core/System.cpp index a9f68c324b..48e22b6f5e 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -32,7 +32,7 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "Common/Math/math_util.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index d80394f55f..31e36a847c 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -19,10 +19,10 @@ #include #include -#include "Common/System/Display.h" -#include "base/NativeApp.h" #include "thin3d/thin3d.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" #include "Common/File/VFS/VFS.h" #include "Common/Log.h" #include "Common/TimeUtil.h" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 8199b3667c..a8f7b95fa6 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -39,7 +39,7 @@ #include "Common/Log.h" #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 1b5be8e793..5db0cbffd8 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -19,7 +19,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 7f46133c19..450eefee31 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -31,7 +31,8 @@ #include "SDL_audio.h" #endif -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "gfx_es2/gpu_features.h" #include "Common/Math/math_util.h" diff --git a/Qt/QtMain.h b/Qt/QtMain.h index 3a1cd3a750..cd33b61765 100644 --- a/Qt/QtMain.h +++ b/Qt/QtMain.h @@ -24,7 +24,8 @@ QTM_USE_NAMESPACE #include "Common/System/Display.h" #include "Common/TimeUtil.h" -#include "file/zip_read.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" #include "Common/Input/InputState.h" diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index fe48956f2e..c2301004d3 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -8,7 +8,8 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Core/MIPS/MIPSDebugInterface.h" #include "Core/Debugger/SymbolMap.h" #include "Core/HLE/sceUmd.h" diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h index 6334bc4aca..cdc08ca196 100644 --- a/Qt/mainwindow.h +++ b/Qt/mainwindow.h @@ -8,7 +8,8 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "ConsoleListener.h" #include "Core/Core.h" #include "Core/Config.h" diff --git a/SDL/SDLGLGraphicsContext.cpp b/SDL/SDLGLGraphicsContext.cpp index 2d41fd1c4f..168a07afcd 100644 --- a/SDL/SDLGLGraphicsContext.cpp +++ b/SDL/SDLGLGraphicsContext.cpp @@ -1,12 +1,16 @@ #include + #include "SDLGLGraphicsContext.h" + +#include "gfx_es2/gpu_features.h" +#include "thin3d/thin3d_create.h" + +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/Display.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" -#include "base/NativeApp.h" -#include "Common/System/Display.h" -#include "gfx_es2/gpu_features.h" -#include "thin3d/thin3d_create.h" #if defined(USING_EGL) #include "EGL/egl.h" diff --git a/SDL/SDLJoystick.cpp b/SDL/SDLJoystick.cpp index 53ed2cc921..50793957e1 100644 --- a/SDL/SDLJoystick.cpp +++ b/SDL/SDLJoystick.cpp @@ -1,7 +1,8 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/File/VFS/VFS.h" #include "Common/FileUtil.h" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 37b3ad12af..78eef5170e 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -21,7 +21,8 @@ SDLJoystick *joystick = NULL; #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "ext/glslang/glslang/Public/ShaderLang.h" #include "image/png_load.h" #include "net/resolve.h" diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp index 77bb943ecc..3c07ab942c 100644 --- a/SDL/SDLVulkanGraphicsContext.cpp +++ b/SDL/SDLVulkanGraphicsContext.cpp @@ -1,6 +1,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Common/System/Display.h" #include "thin3d/thin3d.h" #include "thin3d/thin3d_create.h" @@ -154,4 +155,4 @@ void SDLVulkanGraphicsContext::Poll() { if (vulkan_->GetSwapchain() && renderManager_->NeedsSwapchainRecreate()) { Resize(); } -} \ No newline at end of file +} diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index b7e4b33819..3283d86bf8 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -1,7 +1,6 @@ #include #include "ppsspp_config.h" -#include "base/NativeApp.h" #include "ui/root.h" #include "ui/ui_context.h" #include "ui/view.h" @@ -10,6 +9,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" +#include "Common/System/System.h" #include "Core/Config.h" #include "Core/System.h" #include "Core/HLE/proAdhoc.h" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 518d805292..da64c785f2 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -19,8 +19,6 @@ #include #include -#include "Common/System/Display.h" -#include "base/NativeApp.h" #include "gfx/texture_atlas.h" #include "ui/root.h" #include "ui/ui.h" @@ -28,11 +26,13 @@ #include "ui/view.h" #include "ui/viewgroup.h" +#include "Common/Log.h" #include "Common/Data/Color/RGBAUtil.h" #include "Common/Data/Text/I18n.h" #include "Common/Input/KeyCodes.h" #include "Common/Input/InputState.h" -#include "Common/Log.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" #include "Core/KeyMap.h" #include "Core/Host.h" #include "Core/HLE/sceCtrl.h" diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index eb67a666b8..c92f7b838d 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "base/NativeApp.h" #include "ext/xxhash.h" #include "ui/ui.h" @@ -23,6 +22,7 @@ #include "Common/Data/Encoding/Utf8.h" #include "Common/FileUtil.h" #include "Common/StringUtils.h" +#include "Common/System/System.h" #include "Core/Core.h" #include "Core/Config.h" #include "Core/CwCheat.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 7f7bf849fd..530b0d31ed 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -19,7 +19,8 @@ #include "ppsspp_config.h" #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "gfx_es2/gpu_features.h" #include "Common/Data/Text/I18n.h" #include "ui/ui_context.h" diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 1df7c0d072..8694bbd8bb 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -19,7 +19,7 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" #include "ui/ui_context.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 1856580ce8..f6c6cda45e 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -19,15 +19,10 @@ #include -#include "Common/System/Display.h" -#include "base/NativeApp.h" -#include "Common/Profiler/Profiler.h" - #include "gfx/texture_atlas.h" #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_text.h" -#include "Common/Math/curves.h" #include "ui/root.h" #include "ui/ui.h" #include "ui/ui_context.h" @@ -37,6 +32,11 @@ #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" #include "Common/Log.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" +#include "Common/Profiler/Profiler.h" +#include "Common/Math/curves.h" #include "Common/TimeUtil.h" #ifndef MOBILE_DEVICE diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 81b5c585d1..9404173d19 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -19,7 +19,6 @@ #include "ppsspp_config.h" -#include "base/NativeApp.h" #include "gfx_es2/draw_buffer.h" #include "ui/ui_context.h" #include "ui/view.h" @@ -28,6 +27,8 @@ #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/FileUtil.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Core/Host.h" #include "Core/Config.h" #include "Core/System.h" diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 77ed61bed0..8788263d2b 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -19,20 +19,21 @@ #include -#include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres -#include "base/NativeApp.h" - -#include "Common/Data/Color/RGBAUtil.h" -#include "Common/Math/curves.h" #include "net/resolve.h" #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_buffer.h" -#include "Common/Data/Text/I18n.h" -#include "Common/Data/Encoding/Utf8.h" #include "ui/root.h" #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui_context.h" + +#include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/Math/curves.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Encoding/Utf8.h" #include "UI/EmuScreen.h" #include "UI/GameSettingsScreen.h" #include "UI/GameInfoCache.h" diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index 8b4d4b8b4a..8337c83d1c 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -19,7 +19,7 @@ #include "Common/Data/Color/RGBAUtil.h" #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "Common/Math/math_util.h" #include "ui/ui_context.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 04aa540a49..6439628258 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -21,7 +21,7 @@ #include "ppsspp_config.h" #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" #include "ui/root.h" diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 86bc8360b2..b19f59bdaf 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -20,14 +20,16 @@ #include #include -#include "base/NativeApp.h" -#include "Common/System/Display.h" #include "gfx_es2/draw_buffer.h" -#include "Common/Math/curves.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui.h" + +#include "Common/System/Display.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" +#include "Common/Math/curves.h" #include "Common/File/VFS/VFS.h" #include "Common/Data/Color/RGBAUtil.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index b4bd291126..f0da507d1a 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -43,27 +43,27 @@ #include "Windows/CaptureDevice.h" #endif -#include "Common/System/Display.h" -#include "base/NativeApp.h" #include "net/http_client.h" #include "net/resolve.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/gpu_features.h" +#include "thin3d/thin3d.h" +#include "ui/ui.h" +#include "ui/screen.h" +#include "ui/ui_context.h" +#include "ui/view.h" +#include "android/jni/app-android.h" + +#include "Common/System/Display.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" #include "Common/Math/fast/fast_math.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Profiler/Profiler.h" -#include "thin3d/thin3d.h" -#include "ui/ui.h" -#include "ui/screen.h" -#include "ui/ui_context.h" -#include "ui/view.h" - -#include "android/jni/app-android.h" - #include "Common/Data/Encoding/Utf8.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index f2ec060b2a..620e5c1fc1 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -18,7 +18,6 @@ #include #include -#include "base/NativeApp.h" #include "gfx_es2/draw_buffer.h" #include "ui/view.h" #include "ui/viewgroup.h" @@ -28,19 +27,19 @@ #include "Common/Data/Text/I18n.h" #include "Common/StringUtils.h" +#include "Common/System/System.h" #include "Core/Reporting.h" #include "Core/SaveState.h" #include "Core/System.h" #include "Core/Config.h" #include "Core/ELF/ParamSFO.h" +#include "Core/HLE/sceDisplay.h" +#include "Core/HLE/sceUmd.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" -#include "Core/HLE/sceDisplay.h" -#include "Core/HLE/sceUmd.h" - #include "UI/PauseScreen.h" #include "UI/GameSettingsScreen.h" #include "UI/ReportScreen.h" diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index be00a5eae6..0e6ae604c9 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -25,7 +25,6 @@ #include #endif -#include "base/NativeApp.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" #include "net/http_client.h" @@ -38,6 +37,7 @@ #include "Common/Common.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" +#include "Common/System/System.h" #include "Core/Config.h" #include "Core/WebServer.h" #include "UI/RemoteISOScreen.h" diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index bf63825722..480ad5a9f6 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -17,8 +17,6 @@ #include -#include "Common/System/Display.h" -#include "base/NativeApp.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" #include "thin3d/thin3d.h" @@ -30,6 +28,8 @@ #include "Common/FileUtil.h" #include "Common/Log.h" #include "Common/StringUtils.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" #include "Core/Core.h" #include "Core/Reporting.h" #include "Core/Screenshot.h" diff --git a/UWP/App.cpp b/UWP/App.cpp index ee26dd40a0..94159e7602 100644 --- a/UWP/App.cpp +++ b/UWP/App.cpp @@ -5,8 +5,9 @@ #include -#include "base/NativeApp.h" #include "Common/Input/InputState.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Core/System.h" #include "Core/Core.h" diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index af2508dc88..d1b6b551bc 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -454,6 +454,8 @@ + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 189cf456c9..22b87aec1e 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -446,6 +446,12 @@ System + + System + + + System + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index 721cda4f7d..ced0674db9 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -379,8 +379,6 @@ - - @@ -410,7 +408,6 @@ - diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index a2f90645d1..9cade1425a 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -1,9 +1,6 @@  - - {903dae00-880d-4c12-bd10-29fca750376f} - {98343696-3517-451a-9b47-94d462263e3e} @@ -25,9 +22,6 @@ - - base - thin3d @@ -110,12 +104,6 @@ - - base - - - base - thin3d diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 6f48714b88..54c9b1a73e 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -3,11 +3,9 @@ #include -#include "base/NativeApp.h" #include "file/file_util.h" #include "net/http_client.h" #include "net/resolve.h" -#include "Common/System/Display.h" #include "thin3d/thin3d_create.h" #include "Common/Common.h" @@ -22,6 +20,9 @@ #include "Common/LogManager.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" +#include "Common/System/Display.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Core/System.h" #include "Core/Loaders.h" diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp index d7526a9e2c..be3f93d826 100644 --- a/UWP/UWPHost.cpp +++ b/UWP/UWPHost.cpp @@ -20,7 +20,8 @@ #include #include "file/file_util.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Input/InputState.h" #include "Common/StringUtils.h" diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index 8d57cd19c5..d59874d680 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -24,7 +24,7 @@ #include "DinputDevice.h" #include "Core/Config.h" #include "Common/Input/InputState.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" #include "Common/Input/KeyCodes.h" #include "Core/Reporting.h" #include "Xinput.h" diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index bfb2df00c6..120130161e 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -2,15 +2,17 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" #include "Common/Data/Encoding/Utf8.h" - #include "Common/Log.h" #include "Common/StringUtils.h" #include "Common/GraphicsContext.h" #include "Common/TimeUtil.h" +#include "Common/Thread/ThreadUtil.h" + #include "Windows/EmuThread.h" #include "Windows/W32Util/Misc.h" #include "Windows/MainWindow.h" @@ -23,7 +25,6 @@ #include "Core/System.h" #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Common/Thread/ThreadUtil.h" enum class EmuThreadState { DISABLED, diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 560073b65e..439791544e 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -32,7 +32,8 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Common/Data/Text/I18n.h" diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index fab9c450cc..6cbf136fc5 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -7,11 +7,12 @@ #include "resource.h" +#include "gfx_es2/gpu_features.h" + #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" -#include "base/NativeApp.h" - -#include "gfx_es2/gpu_features.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Common/FileUtil.h" #include "Common/Log.h" #include "Common/LogManager.h" diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp index 6f8071058f..c23efbcf88 100644 --- a/Windows/RawInput.cpp +++ b/Windows/RawInput.cpp @@ -19,7 +19,7 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" #include "Common/System/Display.h" #include "Common/Input/InputState.h" #include "Common/Log.h" diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp index 1066e04c85..f216e8ac80 100644 --- a/Windows/TouchInputHandler.cpp +++ b/Windows/TouchInputHandler.cpp @@ -5,7 +5,7 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" #include "Common/CommonWindows.h" #include "Common/CommonFuncs.h" diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 02d28ff3d6..d337085dbd 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -33,7 +33,7 @@ // native stuff #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" #include "file/file_util.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index 3151a61935..4d12aa827c 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -3,7 +3,7 @@ #include #include -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" #include "Core/Config.h" #include "Common/CommonWindows.h" #include "Common/Log.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index c05d717714..6043e099ca 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -32,7 +32,8 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/Data/Text/I18n.h" diff --git a/android/ab.cmd b/android/ab.cmd index e6f3b7771d..33347178f4 100644 --- a/android/ab.cmd +++ b/android/ab.cmd @@ -5,7 +5,7 @@ copy ..\assets\langregion.ini assets\langregion.ini copy ..\assets\compat.ini assets\compat.ini copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf copy ..\assets\*.png assets\ -REM SET NDK=C:\Android\sdk\ndk\21.3.6528147 -SET NDK=C:\Android\ndk +SET NDK=C:\Android\sdk\ndk\21.3.6528147 +REM SET NDK=C:\Android\ndk SET NDK_MODULE_PATH=..\ext;..\ext\native\ext %NDK%/ndk-build -j32 %* diff --git a/android/jni/AndroidEGLContext.cpp b/android/jni/AndroidEGLContext.cpp index c84a79db01..c29ef49ba4 100644 --- a/android/jni/AndroidEGLContext.cpp +++ b/android/jni/AndroidEGLContext.cpp @@ -1,8 +1,8 @@ -#include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "thin3d/thin3d_create.h" #include "Common/Log.h" +#include "Common/System/System.h" #include "AndroidEGLContext.h" #include "GL/GLInterface/EGLAndroid.h" #include "Core/ConfigValues.h" diff --git a/android/jni/AndroidJavaGLContext.cpp b/android/jni/AndroidJavaGLContext.cpp index d11feaf5a9..c797bd046d 100644 --- a/android/jni/AndroidJavaGLContext.cpp +++ b/android/jni/AndroidJavaGLContext.cpp @@ -1,6 +1,5 @@ #include "AndroidJavaGLContext.h" #include "Common/System/Display.h" -#include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" #include "Common/Log.h" #include "Core/ConfigValues.h" diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp index 6de6dc5cf7..8ddff75115 100644 --- a/android/jni/AndroidVulkanContext.cpp +++ b/android/jni/AndroidVulkanContext.cpp @@ -1,6 +1,7 @@ #include "AndroidVulkanContext.h" -#include "base/NativeApp.h" #include "Common/System/Display.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Log.h" #include "Common/Vulkan/VulkanContext.h" #include "Common/Vulkan/VulkanDebug.h" diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index e60f6bc01c..e81381aa6a 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -49,8 +49,14 @@ struct JNIEnv {}; #define JNI_VERSION_1_6 16 #endif +#include "net/resolve.h" +#include "android/jni/AndroidAudio.h" +#include "gfx/gl_common.h" +#include "gfx_es2/gpu_features.h" + #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Thread/ThreadUtil.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" @@ -58,11 +64,7 @@ struct JNIEnv {}; #include "Common/Input/KeyCodes.h" #include "Common/Profiler/Profiler.h" #include "Common/Math/math_util.h" -#include "net/resolve.h" #include "Common/Data/Text/Parsers.h" -#include "android/jni/AndroidAudio.h" -#include "gfx/gl_common.h" -#include "gfx_es2/gpu_features.h" #include "Common/Log.h" #include "Common/GraphicsContext.h" diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 7e8a930e49..f708266706 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -364,7 +364,6 @@ - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 76060179e4..b670b9fdb1 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -31,9 +31,6 @@ file - - base - ui @@ -296,9 +293,6 @@ {49afd06e-eb44-41ac-b038-e109e444a834} - - {95e41110-57a2-497f-a938-b4c8e9dd6a27} - {d738c2d1-749d-4b60-b98f-f3da0bbbf40c} diff --git a/ext/native/ui/ui_context.cpp b/ext/native/ui/ui_context.cpp index 052332f0bd..68feedb298 100644 --- a/ext/native/ui/ui_context.cpp +++ b/ext/native/ui/ui_context.cpp @@ -3,7 +3,7 @@ #include #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" #include "ui/ui.h" #include "ui/view.h" #include "ui/ui_context.h" diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp index 1f807d6b53..d0182622ca 100644 --- a/ext/native/ui/view.cpp +++ b/ext/native/ui/view.cpp @@ -12,8 +12,7 @@ #include "ui/ui_tween.h" #include "ui/root.h" #include "thin3d/thin3d.h" -#include "base/NativeApp.h" - +#include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 5d88aede92..bd6735e4fe 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -9,8 +9,9 @@ #include #endif -#include "base/NativeApp.h" #include "Common/Profiler/Profiler.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" diff --git a/headless/SDLHeadlessHost.cpp b/headless/SDLHeadlessHost.cpp index baf2da955d..f3652e03af 100644 --- a/headless/SDLHeadlessHost.cpp +++ b/headless/SDLHeadlessHost.cpp @@ -23,11 +23,11 @@ #include "headless/SDLHeadlessHost.h" #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" -#include "Common/File/VFS/VFS.h" -#include "file/zip_read.h" #include "thin3d/thin3d_create.h" #include "thin3d/GLRenderManager.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/Log.h" #include "Common/FileUtil.h" #include "Common/GraphicsContext.h" diff --git a/ios/AppDelegate.mm b/ios/AppDelegate.mm index ab79d0be07..ba8d4ff6d9 100644 --- a/ios/AppDelegate.mm +++ b/ios/AppDelegate.mm @@ -1,6 +1,7 @@ #import "AppDelegate.h" #import "ViewController.h" -#import "base/NativeApp.h" +#import "Common/System/System.h" +#import "Common/System/NativeApp.h" #import "Core/System.h" #import "Core/Config.h" #import "Common/Log.h" diff --git a/ios/DisplayManager.mm b/ios/DisplayManager.mm index e3ae0a7b66..19f828d380 100644 --- a/ios/DisplayManager.mm +++ b/ios/DisplayManager.mm @@ -9,7 +9,8 @@ #import "ViewController.h" #import "AppDelegate.h" #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Core/System.h" #import diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index 4beb622c44..cc8d21c7af 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -13,9 +13,11 @@ #import #include "Common/System/Display.h" -#include "base/NativeApp.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" #include "Common/TimeUtil.h" -#include "file/zip_read.h" +#include "Common/VFS/VFS.h" +#include "Common/VFS/AssetReader.h" #include "Common/Input/InputState.h" #include "net/resolve.h" #include "ui/screen.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 6e702ba12c..1b7837c65b 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -12,9 +12,6 @@ #import #include -#include "Common/System/Display.h" -#include "base/NativeApp.h" -#include "file/zip_read.h" #include "net/resolve.h" #include "ui/screen.h" #include "thin3d/thin3d.h" @@ -22,11 +19,16 @@ #include "thin3d/GLRenderManager.h" #include "gfx_es2/gpu_features.h" +#include "Common/System/Display.h" +#include "Common/System/System.h" +#include "Common/System/NativeApp.h" +#include "Common/VFS/VFS.h" #include "Common/Log.h" #include "Common/TimeUtil.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "Common/GraphicsContext.h" + #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" diff --git a/ios/main.mm b/ios/main.mm index 762d4e8ade..5daecb3e79 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -14,7 +14,8 @@ #import "PPSSPPUIApplication.h" #import "ViewController.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Profiler/Profiler.h" #define CS_OPS_STATUS 0 /* return status */ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 219432057e..8b0cefa854 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -5,11 +5,11 @@ #include #include -#include "base/NativeApp.h" - #include "Common/Log.h" #include "Common/LogManager.h" #include "Common/System/Display.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Common/FileUtil.h" #include "Common/Serialize/Serializer.h" diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp index 31899887c7..7ff7f589ad 100644 --- a/unittest/JitHarness.cpp +++ b/unittest/JitHarness.cpp @@ -18,7 +18,9 @@ #include #include "ppsspp_config.h" -#include "base/NativeApp.h" + +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Core/ConfigValues.h" #include "Core/MIPS/JitCommon/JitCommon.h" diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index 43e947fe95..edb5939cba 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -34,10 +34,11 @@ #endif #include "ppsspp_config.h" -#include "base/NativeApp.h" +#include "Common/System/NativeApp.h" +#include "Common/System/System.h" #include "Common/Input/InputState.h" #include "ext/disarm.h" -#include "math/math_util.h" +#include "Common/Math/math_util.h" #include "Common/Data/Text/Parsers.h" #include "Common/ArmEmitter.h" From 7ba8f684a0a9f318c9c2b6ce6eaaeff3aefd56bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 12:37:19 +0200 Subject: [PATCH 6/7] Mac/ios buildfix --- Common/MemArenaDarwin.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Common/MemArenaDarwin.cpp b/Common/MemArenaDarwin.cpp index 593bb1495e..4d197c1f85 100644 --- a/Common/MemArenaDarwin.cpp +++ b/Common/MemArenaDarwin.cpp @@ -20,11 +20,12 @@ #if defined(__APPLE__) #include -#include +#include -#include "FileUtil.h" -#include "MemoryUtil.h" -#include "MemArena.h" +#include "Common/Log.h" +#include "Common/FileUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/MemArena.h" #include #include From 6ea8af293944c9afca8f880c0d86f02cbc8d531d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Oct 2020 13:24:12 +0200 Subject: [PATCH 7/7] iOS buildfix --- ios/PPSSPPUIApplication.mm | 4 ++-- ios/ViewController.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index cc8d21c7af..eb66aa202b 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -16,8 +16,8 @@ #include "Common/System/System.h" #include "Common/System/NativeApp.h" #include "Common/TimeUtil.h" -#include "Common/VFS/VFS.h" -#include "Common/VFS/AssetReader.h" +#include "Common/File/VFS/VFS.h" +#include "Common/File/VFS/AssetReader.h" #include "Common/Input/InputState.h" #include "net/resolve.h" #include "ui/screen.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 1b7837c65b..a6be65bedd 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -22,7 +22,7 @@ #include "Common/System/Display.h" #include "Common/System/System.h" #include "Common/System/NativeApp.h" -#include "Common/VFS/VFS.h" +#include "Common/File/VFS/VFS.h" #include "Common/Log.h" #include "Common/TimeUtil.h" #include "Common/Input/InputState.h"