preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-14 15:00:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13497 from hrydgard/move-native-util-to-common

Browse Source 
Move native util to common
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2020-10-04 09:07:16 +02:00
2 parents 5c9b7bb859 de3b46077a
commit 1fb47d4f18
193 files changed
+585 -797
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+3
View File
@@ -116,3 +116,6 @@ debian/ppsspp/
# RenderDoc
*.rdc
# bad output from libretro. don't want to accidentally add it
nul
CMakeLists.txt
+22 -20
View File
@@ -433,6 +433,27 @@ add_library(Common STATIC
Common/Crypto/sha1.h
Common/Crypto/sha256.cpp
Common/Crypto/sha256.h
Common/Data/Collections/ConstMap.h
Common/Data/Collections/TinySet.h
Common/Data/Color/RGBAUtil.cpp
Common/Data/Color/RGBAUtil.h
Common/Data/Encoding/Base64.cpp
Common/Data/Encoding/Base64.h
Common/Data/Encoding/Compression.cpp
Common/Data/Encoding/Compression.h
Common/Data/Encoding/Shiftjis.h
Common/Data/Encoding/Utf8.cpp
Common/Data/Encoding/Utf8.h
Common/Data/Encoding/Utf16.h
Common/Data/Hash/Hash.cpp
Common/Data/Hash/Hash.h
Common/Data/Text/I18n.cpp
Common/Data/Text/I18n.h
Common/Data/Text/Parsers.cpp
Common/Data/Text/Parsers.h
Common/Data/Text/WrapText.cpp
Common/Data/Text/WrapText.h
Common/Data/Random/Rng.h
Common/Input/GestureDetector.cpp
Common/Input/GestureDetector.h
Common/Input/KeyCodes.h
@@ -957,14 +978,8 @@ endif()
add_library(native STATIC
${nativeExtra}
ext/native/base/colorutil.cpp
ext/native/base/colorutil.h
ext/native/base/display.cpp
ext/native/base/display.h
ext/native/data/base64.cpp
ext/native/data/base64.h
ext/native/data/compression.cpp
ext/native/data/compression.h
ext/native/file/chunk_file.cpp
ext/native/file/chunk_file.h
ext/native/file/fd_util.cpp
@@ -1005,8 +1020,6 @@ add_library(native STATIC
ext/native/gfx_es2/glsl_program.h
ext/native/gfx_es2/gl3stub.c
ext/native/gfx_es2/gl3stub.h
ext/native/i18n/i18n.cpp
ext/native/i18n/i18n.h
ext/native/image/png_load.cpp
ext/native/image/png_load.h
ext/native/image/zim_load.cpp
@@ -1069,17 +1082,6 @@ add_library(native STATIC
ext/native/ui/view.h
ext/native/ui/viewgroup.cpp
ext/native/ui/viewgroup.h
ext/native/util/hash/hash.cpp
ext/native/util/hash/hash.h
ext/native/util/random/rng.h
ext/native/util/text/utf8.h
ext/native/util/text/utf8.cpp
ext/native/util/text/parsers.h
ext/native/util/text/parsers.cpp
ext/native/util/text/wrap_text.h
ext/native/util/text/wrap_text.cpp
ext/native/util/const_map.h
ext/native/util/tiny_set.h
ext/jpge/jpgd.cpp
ext/jpge/jpgd.h
ext/jpge/jpge.cpp
@@ -1096,7 +1098,7 @@ if(ANDROID)
set(ATOMIC_LIB atomic)
endif()
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB})
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
if(TARGET Ext::GLEW)
target_link_libraries(native Ext::GLEW)
endif()
Common/ArmCPUDetect.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "CPUDetect.h"
#include "StringUtils.h"
#include "FileUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#if PPSSPP_PLATFORM(WINDOWS)
#if PPSSPP_PLATFORM(UWP)
Common/Common.vcxproj
+21
View File
@@ -359,6 +359,19 @@
<ClInclude Include="BitScan.h" />
<ClInclude Include="BitSet.h" />
<ClInclude Include="Buffer.h" />
<ClInclude Include="Data\Collections\ConstMap.h" />
<ClInclude Include="Data\Collections\TinySet.h" />
<ClInclude Include="Data\Color\RGBAUtil.h" />
<ClInclude Include="Data\Encoding\Base64.h" />
<ClInclude Include="Data\Encoding\Compression.h" />
<ClInclude Include="Data\Encoding\Shiftjis.h" />
<ClInclude Include="Data\Encoding\Utf16.h" />
<ClInclude Include="Data\Encoding\Utf8.h" />
<ClInclude Include="Data\Hash\Hash.h" />
<ClInclude Include="Data\Random\Rng.h" />
<ClInclude Include="Data\Text\I18n.h" />
<ClInclude Include="Data\Text\Parsers.h" />
<ClInclude Include="Data\Text\WrapText.h" />
<ClInclude Include="FakeEmitter.h" />
<ClInclude Include="Input\GestureDetector.h" />
<ClInclude Include="Input\InputState.h" />
@@ -614,6 +627,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Data\Color\RGBAUtil.cpp" />
<ClCompile Include="Data\Encoding\Base64.cpp" />
<ClCompile Include="Data\Encoding\Compression.cpp" />
<ClCompile Include="Data\Encoding\Utf8.cpp" />
<ClCompile Include="Data\Hash\Hash.cpp" />
<ClCompile Include="Data\Text\I18n.cpp" />
<ClCompile Include="Data\Text\Parsers.cpp" />
<ClCompile Include="Data\Text\WrapText.cpp" />
<ClCompile Include="Input\GestureDetector.cpp" />
<ClCompile Include="Input\InputState.cpp" />
<ClCompile Include="Log.cpp" />
Common/Common.vcxproj.filters
+84
View File
@@ -137,6 +137,45 @@
<ClInclude Include="Input\KeyCodes.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="Data\Random\Rng.h">
<Filter>Data\Random</Filter>
</ClInclude>
<ClInclude Include="Data\Text\I18n.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Text\Parsers.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Text\WrapText.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Base64.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Compression.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Shiftjis.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Utf8.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Utf16.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Hash\Hash.h">
<Filter>Data\Hash</Filter>
</ClInclude>
<ClInclude Include="Data\Collections\ConstMap.h">
<Filter>Data\Collections</Filter>
</ClInclude>
<ClInclude Include="Data\Collections\TinySet.h">
<Filter>Data\Collections</Filter>
</ClInclude>
<ClInclude Include="Data\Color\RGBAUtil.h">
<Filter>Data\Color</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@@ -270,6 +309,30 @@
<ClCompile Include="Input\InputState.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="Data\Text\I18n.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Text\Parsers.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Text\WrapText.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Base64.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Compression.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Utf8.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Hash\Hash.cpp">
<Filter>Data\Hash</Filter>
</ClCompile>
<ClCompile Include="Data\Color\RGBAUtil.cpp">
<Filter>Data\Color</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@@ -299,6 +362,27 @@
<Filter Include="Input">
<UniqueIdentifier>{fd0bac4f-e3e2-4201-8902-2d19b50d5bf7}</UniqueIdentifier>
</Filter>
<Filter Include="Data">
<UniqueIdentifier>{072c36eb-a283-40b2-b8b1-02ec57d3bbae}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Collections">
<UniqueIdentifier>{a162915f-e53a-4f42-a222-e863235a2d37}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Hash">
<UniqueIdentifier>{891eae07-622d-46d5-9fc6-a4c320649eb9}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Encoding">
<UniqueIdentifier>{0bd9bfae-7d4e-4f54-9aae-8fb11ab8c999}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Random">
<UniqueIdentifier>{16fc7858-b6db-4eb2-bd4c-1354ffacda5f}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Text">
<UniqueIdentifier>{c2d25b54-23fc-4e80-8d9b-5d7e94fe557e}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Color">
<UniqueIdentifier>{1ada1f0f-6f1c-4bf2-8450-1fc63d77da17}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">
Common/ConsoleListener.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "ppsspp_config.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Common.h"
#include "Common/ConsoleListener.h"
#include "Common/StringUtils.h"
ext/native/util/const_map.h → Common/Data/Collections/ConstMap.h
View File
File renamed without changes.
ext/native/util/tiny_set.h → Common/Data/Collections/TinySet.h
View File
File renamed without changes.
ext/native/base/colorutil.cpp → Common/Data/Color/RGBAUtil.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "base/colorutil.h"
#include "Common/Data/Color/RGBAUtil.h"
template <typename T>
static T clamp(T f, T low, T high) {
ext/native/base/colorutil.h → Common/Data/Color/RGBAUtil.h
View File
File renamed without changes.
ext/native/data/base64.cpp → Common/Data/Encoding/Base64.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
// TODO: This is a simple but not very efficient implementation.
std::string Base64Encode(const uint8_t *p, size_t sz) {
ext/native/data/base64.h → Common/Data/Encoding/Base64.h
View File
File renamed without changes.
ext/native/data/compression.cpp → Common/Data/Encoding/Compression.cpp
View File
File renamed without changes.
ext/native/data/compression.h → Common/Data/Encoding/Compression.h
View File
File renamed without changes.
ext/native/util/text/shiftjis.h → Common/Data/Encoding/Shiftjis.h
View File
File renamed without changes.
ext/native/util/text/utf16.h → Common/Data/Encoding/Utf16.h
View File
File renamed without changes.
ext/native/util/text/utf8.cpp → Common/Data/Encoding/Utf8.cpp
+2 -2
View File
@@ -27,8 +27,8 @@
#include <algorithm>
#include <string>
#include "utf8.h"
#include "utf16.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Encoding/Utf16.h"
// is start of UTF sequence
inline bool isutf(char c) {
ext/native/util/text/utf8.h → Common/Data/Encoding/Utf8.h
View File
File renamed without changes.
ext/native/util/hash/hash.cpp → Common/Data/Hash/Hash.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include <cstdint>
#include "util/hash/hash.h"
#include "Common/Data/Hash/Hash.h"
namespace hash {
ext/native/util/hash/hash.h → Common/Data/Hash/Hash.h
View File
File renamed without changes.
ext/native/util/random/rng.h → Common/Data/Random/Rng.h
View File
File renamed without changes.
ext/native/i18n/i18n.cpp → Common/Data/Text/I18n.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "file/ini_file.h"
#include "file/vfs.h"
ext/native/i18n/i18n.h → Common/Data/Text/I18n.h
View File
File renamed without changes.
ext/native/util/text/parsers.cpp → Common/Data/Text/Parsers.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <cstdio>
#include <string>
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/StringUtils.h"
ext/native/util/text/parsers.h → Common/Data/Text/Parsers.h
View File
File renamed without changes.
ext/native/util/text/wrap_text.cpp → Common/Data/Text/WrapText.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include <cstring>
#include "gfx_es2/draw_buffer.h"
#include "util/text/utf8.h"
#include "util/text/wrap_text.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Text/WrapText.h"
bool WordWrapper::IsCJK(uint32_t c) {
if (c < 0x1000) {
ext/native/util/text/wrap_text.h → Common/Data/Text/WrapText.h
View File
File renamed without changes.
Common/FileUtil.cpp
+1 -1
View File
@@ -60,7 +60,7 @@
#endif // !defined(IOS)
#endif // __APPLE__
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include <sys/stat.h>
Common/KeyMap.cpp
+2 -2
View File
@@ -24,11 +24,11 @@
#include "CommonWindows.h"
#endif
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "file/ini_file.h"
#include "Common/Input/InputState.h"
#include "ppsspp_config.h"
#include "Common/Log.h"
#include "Common/KeyMap.h"
#include "Common/StringUtils.h"
Common/Log.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "Common.h"
#include "Common/Log.h"
#include "StringUtils.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#if PPSSPP_PLATFORM(ANDROID)
#include <android/log.h>
Common/LogManager.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <algorithm>
#include <cstring>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/LogManager.h"
#include "Common/ConsoleListener.h"
Common/SysError.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <cstring>
#include <string>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "SysError.h"
#ifdef _WIN32
Core/Config.cpp
+2 -2
View File
@@ -26,11 +26,11 @@
#include "base/display.h"
#include "base/NativeApp.h"
#include "file/ini_file.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "json/json_reader.h"
#include "gfx_es2/gpu_features.h"
#include "net/http_client.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "net/url.h"
#include "Common/CPUDetect.h"
Core/CwCheat.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include <algorithm>
#include <cctype>
#include <cstdint>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
@@ -19,7 +19,7 @@
#include "GPU/Common/PostShader.h"
#ifdef _WIN32
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#endif
static int CheatEvent = -1;
Core/Debugger/SymbolMap.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include <algorithm>
#include <memory>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "zlib.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
Core/Debugger/WebSocket/DisasmSubscriber.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cctype>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/Breakpoints.h"
Core/Debugger/WebSocket/GPUBufferSubscriber.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <png.h>
#include <zlib.h>
#endif
#include "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/WebSocket/GPUBufferSubscriber.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"
Core/Debugger/WebSocket/GPURecordSubscriber.cpp
+1 -1
View File
@@ -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 "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
#include "Common/FileUtil.h"
#include "Core/Debugger/WebSocket/GPURecordSubscriber.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"
Core/Debugger/WebSocket/WebSocketUtils.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
#include <cmath>
#include <limits>
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"
Core/Dialog/PSPDialog.cpp
+1 -1
View File
@@ -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 "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/Dialog/PSPMsgDialog.cpp
+2 -2
View File
@@ -25,8 +25,8 @@
#include "Core/HLE/sceCtrl.h"
#include "Core/MemMapHelpers.h"
#include "Core/Reporting.h"
#include "i18n/i18n.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
static const float FONT_SCALE = 0.65f;
Core/Dialog/PSPNetconfDialog.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#include "Common/CommonWindows.h"
#endif
#include <TimeUtil.h>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/Config.h"
@@ -31,7 +31,7 @@
#include "Core/HLE/sceNet.h"
#include "Core/HLE/sceNetAdhoc.h"
#include "Core/Dialog/PSPNetconfDialog.h"
#include "ext/native/util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#define NETCONF_CONNECT_APNET 0
Core/Dialog/PSPOskDialog.cpp
+2 -2
View File
@@ -17,9 +17,9 @@
#include <algorithm>
#include "base/NativeApp.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/Dialog/PSPOskDialog.h"
Core/Dialog/PSPSaveDialog.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <thread>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
Core/Dialog/SavedataParam.cpp
+1 -1
View File
@@ -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 "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Log.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/FileLoaders/DiskCachingFileLoader.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "ppsspp_config.h"
#include "file/file_util.h"
#include "file/free.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/CommonWindows.h"
#include "Core/FileLoaders/DiskCachingFileLoader.h"
Core/FileLoaders/LocalFileLoader.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <cstdio>
#include "ppsspp_config.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "file/file_util.h"
#include "Common/FileUtil.h"
#include "Core/FileLoaders/LocalFileLoader.h"
Core/FileSystems/BlockDevices.cpp
+2 -1
View File
@@ -18,7 +18,8 @@
#include <cstdio>
#include <cstring>
#include <algorithm>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/FileUtil.h"
#include "Common/Swap.h"
#include "Core/Loaders.h"
Core/FileSystems/DirectoryFileSystem.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
#include "file/free.h"
#include "file/zip_read.h"
#include "i18n/i18n.h"
#include "util/text/utf8.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"
Core/FileSystems/VirtualDiscFileSystem.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "Core/HLE/sceKernel.h"
#include "Core/Reporting.h"
#include "file/zip_read.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#ifdef _WIN32
#include "Common/CommonWindows.h"
Core/HLE/proAdhoc.cpp
+2 -2
View File
@@ -37,9 +37,9 @@
#include <cstring>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/TimeUtil.h"
Core/HLE/proAdhocServer.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
#define MSG_NOSIGNAL 0x00
#endif
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
Core/HLE/sceCcc.cpp
+3 -3
View File
@@ -15,9 +15,9 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "util/text/utf8.h"
#include "util/text/utf16.h"
#include "util/text/shiftjis.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Encoding/Utf16.h"
#include "Common/Data/Encoding/Shiftjis.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/HLE/sceDisplay.cpp
+2 -1
View File
@@ -26,9 +26,10 @@
#include <sys/time.h>
#endif
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "profiler/profiler.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Serialize/Serializer.h"
Core/HLE/sceNet.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#endif
#include "net/resolve.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/HLE/sceNetAdhoc.cpp
+1 -1
View File
@@ -56,7 +56,7 @@
#include "Core/HLE/sceNet.h"
#include "Core/HLE/proAdhocServer.h"
#include "Core/HLE/KernelWaitHelpers.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
// shared in sceNetAdhoc.h since it need to be used from sceNet.cpp also
Core/HLE/sceUsb.cpp
-1
View File
@@ -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 "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"
Core/HLE/sceUsbCam.cpp
+2 -1
View File
@@ -18,8 +18,9 @@
#include <algorithm>
#include <mutex>
#include "base/NativeApp.h"
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"
Core/HLE/sceUsbMic.cpp
-1
View File
@@ -17,7 +17,6 @@
#include <mutex>
#include "base/NativeApp.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"
Core/MIPS/MIPS.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include <cstddef>
#include "util/random/rng.h"
#include "Common/Data/Random/Rng.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
// #include "Core/CoreParameter.h"
Core/MIPS/MIPSAsm.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Common/CommonTypes.h"
#include "ext/armips/Core/Assembler.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
Core/PSPLoaders.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <thread>
#include "file/file_util.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
Core/SaveState.cpp
+2 -2
View File
@@ -20,9 +20,9 @@
#include <thread>
#include <mutex>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/FileUtil.h"
#include "Common/Serialize/Serializer.h"
Core/System.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "base/NativeApp.h"
#include "math/math_util.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/TimeUtil.h"
Core/TextureReplacer.cpp
+2 -2
View File
@@ -23,10 +23,10 @@
#include <algorithm>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ext/xxhash.h"
#include "file/ini_file.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/ColorConv.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
Core/Util/GameManager.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#else
#include "ext/libzip/zip.h"
#endif
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "file/ini_file.h"
#include "Common/Log.h"
@@ -42,7 +42,7 @@
#include "Core/System.h"
#include "Core/FileSystems/ISOFileSystem.h"
#include "Core/Util/GameManager.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
GameManager g_GameManager;
Core/Util/PPGeDraw.cpp
+2 -2
View File
@@ -17,13 +17,13 @@
#include <algorithm>
#include "base/colorutil.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "file/vfs.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_text.h"
#include "image/zim_load.h"
#include "image/png_load.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/Util/PortManager.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <string>
#include <thread>
#include "Common/TimeUtil.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "net/resolve.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
GPU/Common/FramebufferManagerCommon.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "ext/native/thin3d/thin3d.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/ColorConv.h"
#include "Common/Common.h"
#include "Core/Config.h"
GPU/D3D11/GPU_D3D11.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/MIPS.h"
GPU/D3D11/ShaderManagerD3D11.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "math/math_util.h"
#include "math/dataconv.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Log.h"
#include "Common/Common.h"
#include "Core/Config.h"
GPU/Directx9/GPU_DX9.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/MIPS.h"
GPU/Directx9/ShaderManagerDX9.cpp
+2 -2
View File
@@ -23,12 +23,12 @@
#include <map>
#include "gfx/d3d9_shader.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/lin/matrix4x4.h"
#include "math/math_util.h"
#include "math/dataconv.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Common.h"
#include "Common/Log.h"
GPU/GLES/GPU_GLES.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Log.h"
#include "Common/Serialize/Serializer.h"
GPU/GLES/ShaderManagerGLES.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "math/dataconv.h"
#include "gfx/gl_debug_log.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "math/lin/matrix4x4.h"
#include "profiler/profiler.h"
GPU/GLES/TextureCacheGLES.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "ext/xxhash.h"
#include "gfx/gl_debug_log.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "profiler/profiler.h"
#include "thin3d/GLRenderManager.h"
GPU/GPUCommon.h
-1
View File
@@ -365,7 +365,6 @@ private:
// Debug stats.
double timeSteppingStarted_;
double timeSpentStepping_;
int lastVsync_ = -1;
};
GPU/Vulkan/ShaderManagerVulkan.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "math/dataconv.h"
#include "profiler/profiler.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanContext.h"
GPU/Vulkan/TextureCacheVulkan.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "ext/xxhash.h"
#include "file/vfs.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "profiler/profiler.h"
#include "thin3d/thin3d.h"
Qt/NKCodeFromQt.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "util/const_map.h"
#include "Common/Data/Collections/ConstMap.h"
#include <map>
// TODO: Add any missing keys
Qt/QtMain.cpp
+6 -3
View File
@@ -30,12 +30,15 @@
#include "SDL/SDLJoystick.h"
#include "SDL_audio.h"
#endif
#include "QtMain.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "math/math_util.h"
#include "QtMain.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/HW/Camera.h"
Qt/QtMain.h
-1
View File
@@ -30,7 +30,6 @@ QTM_USE_NAMESPACE
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "thin3d/thin3d.h"
#include "base/NativeApp.h"
#include "net/resolve.h"
#include "NKCodeFromQt.h"
Qt/mainwindow.h
+1
View File
@@ -8,6 +8,7 @@
#include <QMainWindow>
#include <QActionGroup>
#include "base/NativeApp.h"
#include "ConsoleListener.h"
#include "Core/Core.h"
#include "Core/Config.h"
SDL/NKCodeFromSDL.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "util/const_map.h"
#include "Common/Data/Collections/ConstMap.h"
#include <map>
// TODO: Add any missing keys
SDL/SDLJoystick.cpp
+7 -5
View File
@@ -1,11 +1,13 @@
#include "SDL/SDLJoystick.h"
#include "Core/Config.h"
#include "Common/FileUtil.h"
#include "file/vfs.h"
#include <iostream>
#include <string>
#include "base/NativeApp.h"
#include "file/vfs.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"
#include "SDL/SDLJoystick.h"
using namespace std;
static int SDLJoystickEventHandlerWrapper(void* userdata, SDL_Event* event)
SDL/SDLJoystick.h
-1
View File
@@ -10,7 +10,6 @@
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "net/resolve.h"
#include "base/NativeApp.h"
class SDLJoystick{
public:
SDL/SDLMain.cpp
+8 -8
View File
@@ -21,19 +21,13 @@ SDLJoystick *joystick = NULL;
#include <locale>
#include "base/display.h"
#include "Common/TimeUtil.h"
#include "base/NativeApp.h"
#include "ext/glslang/glslang/Public/ShaderLang.h"
#include "image/png_load.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "net/resolve.h"
#include "NKCodeFromSDL.h"
#include "util/const_map.h"
#include "util/text/utf8.h"
#include "math/math_util.h"
#include "thin3d/GLRenderManager.h"
#include "Common/Thread/ThreadUtil.h"
#include "math.h"
#include "SDL_syswm.h"
@@ -46,11 +40,17 @@ SDLJoystick *joystick = NULL;
#include <X11/Xlib-xcb.h>
#endif
#include "Common/GraphicsContext.h"
#include "Common/TimeUtil.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Data/Collections/ConstMap.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Thread/ThreadUtil.h"
#include "Core/System.h"
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Common/GraphicsContext.h"
#include "SDLGLGraphicsContext.h"
#include "SDLVulkanGraphicsContext.h"
SDL/SDLVulkanGraphicsContext.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "thin3d/thin3d.h"
#include "thin3d/thin3d_create.h"
#include "thin3d/VulkanRenderManager.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Core/System.h"
#include "SDLVulkanGraphicsContext.h"
UI/ChatScreen.cpp
+6 -3
View File
@@ -1,12 +1,15 @@
#include <ctype.h>
#include "ppsspp_config.h"
#include "i18n/i18n.h"
#include "base/NativeApp.h"
#include "ui/root.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "ui/ui.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/HLE/proAdhoc.h"
@@ -21,7 +24,7 @@ void ChatMenu::CreatePopupContents(UI::ViewGroup *parent) {
#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL)
chatEdit_ = bottom->Add(new TextEdit("", n->T("Chat Here"), new LinearLayoutParams(1.0)));
#if defined(USING_WIN_UI)
//freeze the ui when using ctrl + C hotkey need workaround
// freeze the ui when using ctrl + C hotkey need workaround
if (g_Config.bBypassOSKWithKeyboard && !g_Config.bFullScreen) {
System_InputBoxGetString(n->T("Chat"), n->T("Chat Here"), [](bool result, const std::string &value) {
if (result) {
UI/ComboKeyMappingScreen.cpp
+2 -2
View File
@@ -15,8 +15,8 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "i18n/i18n.h"
#include "base/colorutil.h"
#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"
UI/ControlMappingScreen.cpp
+7 -6
View File
@@ -19,23 +19,24 @@
#include <deque>
#include <mutex>
#include "base/colorutil.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx/texture_atlas.h"
#include "i18n/i18n.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Input/InputState.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.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/KeyMap.h"
#include "Core/Host.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/System.h"
#include "Common/Log.h"
#include "Common/KeyMap.h"
#include "Core/Config.h"
#include "UI/ControlMappingScreen.h"
#include "UI/GameSettingsScreen.h"
UI/ControlMappingScreen.h
+1 -1
View File
@@ -22,10 +22,10 @@
#include <mutex>
#include <vector>
#include "i18n/i18n.h"
#include "ui/view.h"
#include "ui/ui_screen.h"
#include "Common/Data/Text/I18n.h"
#include "UI/MiscScreens.h"
class ControlMapper;
UI/CwCheatScreen.cpp
+3 -2
View File
@@ -15,11 +15,12 @@
// 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 "i18n/i18n.h"
#include "ui/ui.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
#include "Core/Core.h"
UI/DevScreens.cpp
+2 -1
View File
@@ -19,8 +19,9 @@
#include "ppsspp_config.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
UI/DevScreens.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include <vector>
#include "file/file_util.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/ui_screen.h"
#include "UI/MiscScreens.h"
UI/DiscordIntegration.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "Common/Log.h"
#include "Core/Config.h"
#include "DiscordIntegration.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(LINUX)) && !PPSSPP_PLATFORM(ANDROID) && !PPSSPP_PLATFORM(UWP)
UI/DisplayLayoutScreen.cpp
+4 -3
View File
@@ -18,15 +18,16 @@
#include <algorithm>
#include <vector>
#include "base/colorutil.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_buffer.h"
#include "i18n/i18n.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "DisplayLayoutScreen.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Data/Text/I18n.h"
#include "UI/DisplayLayoutScreen.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/System.h"
UI/EmuScreen.cpp
+3 -2
View File
@@ -20,21 +20,22 @@
#include <algorithm>
#include "base/display.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/gpu_features.h"
#include "gfx_es2/draw_text.h"
#include "Common/Input/InputState.h"
#include "math/curves.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
#include "ui/ui_tween.h"
#include "ui/view.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Input/InputState.h"
#include "Common/KeyMap.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"
UI/GPUDriverTestScreen.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "GPUDriverTestScreen.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/view.h"
static const std::vector<Draw::ShaderSource> fsDiscard = {
UI/GameScreen.cpp
+5 -2
View File
@@ -18,12 +18,15 @@
#include <algorithm>
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "gfx_es2/draw_buffer.h"
#include "i18n/i18n.h"
#include "util/text/utf8.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Core/Host.h"
#include "Core/Config.h"
Loaded 100 of 193 files, more files were not shown because too many files have changed in this diff. Show more