Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-07 10:53:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move math and some file and data conversion files out from native to Common.

Browse Source 
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
This commit is contained in:
Henrik Rydgård 2020-10-04 00:25:21 +02:00
parent 1fb47d4f18
commit 9e41fafd0d
162 changed files with 739 additions and 790 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
CMakeLists.txt
View File

@ -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

36
Common/Common.vcxproj
View File

@ -362,20 +362,35 @@
<ClInclude Include="Data\Collections\ConstMap.h" />
<ClInclude Include="Data\Collections\TinySet.h" />
<ClInclude Include="Data\Color\RGBAUtil.h" />
<ClInclude Include="Data\Convert\SmallDataConvert.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\Format\IniFile.h" />
<ClInclude Include="Data\Format\RIFF.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="File\DiskFree.h" />
<ClInclude Include="File\PathBrowser.h" />
<ClInclude Include="File\VFS\VFS.h" />
<ClInclude Include="File\VFS\AssetReader.h" />
<ClInclude Include="Input\GestureDetector.h" />
<ClInclude Include="Input\InputState.h" />
<ClInclude Include="Input\KeyCodes.h" />
<ClInclude Include="Math\curves.h" />
<ClInclude Include="Math\expression_parser.h" />
<ClInclude Include="Math\fast\fast_math.h" />
<ClInclude Include="Math\fast\fast_matrix.h" />
<ClInclude Include="Math\geom2d.h" />
<ClInclude Include="Math\lin\matrix4x4.h" />
<ClInclude Include="Math\lin\vec3.h" />
<ClInclude Include="Math\math_util.h" />
<ClInclude Include="Serialize\SerializeDeque.h" />
<ClInclude Include="Serialize\SerializeFuncs.h" />
<ClInclude Include="ColorConvNEON.h" />
@ -420,7 +435,6 @@
</ClInclude>
<ClInclude Include="GraphicsContext.h" />
<ClInclude Include="Hashmaps.h" />
<ClInclude Include="KeyMap.h" />
<ClInclude Include="Log.h" />
<ClInclude Include="LogManager.h" />
<ClInclude Include="MakeUnique.h" />
@ -628,16 +642,31 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Data\Color\RGBAUtil.cpp" />
<ClCompile Include="Data\Convert\SmallDataConvert.cpp" />
<ClCompile Include="Data\Encoding\Base64.cpp" />
<ClCompile Include="Data\Encoding\Compression.cpp" />
<ClCompile Include="Data\Encoding\Utf8.cpp" />
<ClCompile Include="Data\Format\IniFile.cpp" />
<ClCompile Include="Data\Format\RIFF.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="File\DiskFree.cpp" />
<ClCompile Include="File\PathBrowser.cpp" />
<ClCompile Include="File\VFS\VFS.cpp" />
<ClCompile Include="File\VFS\AssetReader.cpp" />
<ClCompile Include="Input\GestureDetector.cpp" />
<ClCompile Include="Input\InputState.cpp" />
<ClCompile Include="Log.cpp" />
<ClCompile Include="Math\curves.cpp" />
<ClCompile Include="Math\expression_parser.cpp" />
<ClCompile Include="Math\fast\fast_math.c" />
<ClCompile Include="Math\fast\fast_matrix.c" />
<ClCompile Include="Math\fast\fast_matrix_sse.c" />
<ClCompile Include="Math\lin\matrix4x4.cpp" />
<ClCompile Include="Math\lin\vec3.cpp" />
<ClCompile Include="Math\math_util.cpp" />
<ClCompile Include="Serialize\Serializer.cpp" />
<ClCompile Include="ColorConv.cpp" />
<ClCompile Include="ConsoleListener.cpp" />
@ -677,7 +706,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="KeyMap.cpp" />
<ClCompile Include="LogManager.cpp" />
<ClCompile Include="MemArenaAndroid.cpp" />
<ClCompile Include="MemArenaPosix.cpp" />
@ -712,6 +740,10 @@
<Project>{f761046e-6c38-4428-a5f1-38391a37bb34}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Math\fast\fast_matrix_neon.S" />
<None Include="Math\lin\matrix_neon.s" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

121
Common/Common.vcxproj.filters
View File

@ -23,7 +23,6 @@
<ClInclude Include="Crypto\md5.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="KeyMap.h" />
<ClInclude Include="Swap.h" />
<ClInclude Include="CommonWindows.h" />
<ClInclude Include="Crypto\sha1.h">
@ -176,6 +175,51 @@
<ClInclude Include="Data\Color\RGBAUtil.h">
<Filter>Data\Color</Filter>
</ClInclude>
<ClInclude Include="Data\Convert\SmallDataConvert.h">
<Filter>Data\Convert</Filter>
</ClInclude>
<ClInclude Include="Math\curves.h">
<Filter>Math</Filter>
</ClInclude>
<ClInclude Include="Math\expression_parser.h">
<Filter>Math</Filter>
</ClInclude>
<ClInclude Include="Math\geom2d.h">
<Filter>Math</Filter>
</ClInclude>
<ClInclude Include="Math\math_util.h">
<Filter>Math</Filter>
</ClInclude>
<ClInclude Include="Math\lin\matrix4x4.h">
<Filter>Math\lin</Filter>
</ClInclude>
<ClInclude Include="Math\lin\vec3.h">
<Filter>Math\lin</Filter>
</ClInclude>
<ClInclude Include="Math\fast\fast_math.h">
<Filter>Math\fast</Filter>
</ClInclude>
<ClInclude Include="Math\fast\fast_matrix.h">
<Filter>Math\fast</Filter>
</ClInclude>
<ClInclude Include="Data\Format\RIFF.h">
<Filter>Data\Format</Filter>
</ClInclude>
<ClInclude Include="File\DiskFree.h">
<Filter>File</Filter>
</ClInclude>
<ClInclude Include="File\PathBrowser.h">
<Filter>File</Filter>
</ClInclude>
<ClInclude Include="File\VFS\VFS.h">
<Filter>File\VFS</Filter>
</ClInclude>
<ClInclude Include="File\VFS\AssetReader.h">
<Filter>File\VFS</Filter>
</ClInclude>
<ClInclude Include="Data\Format\IniFile.h">
<Filter>Data\Format</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -195,7 +239,6 @@
<ClCompile Include="Crypto\md5.cpp">
<Filter>Crypto</Filter>
</ClCompile>
<ClCompile Include="KeyMap.cpp" />
<ClCompile Include="Crypto\sha1.cpp">
<Filter>Crypto</Filter>
</ClCompile>
@ -333,6 +376,51 @@
<ClCompile Include="Data\Color\RGBAUtil.cpp">
<Filter>Data\Color</Filter>
</ClCompile>
<ClCompile Include="Data\Convert\SmallDataConvert.cpp">
<Filter>Data\Convert</Filter>
</ClCompile>
<ClCompile Include="Math\curves.cpp">
<Filter>Math</Filter>
</ClCompile>
<ClCompile Include="Math\expression_parser.cpp">
<Filter>Math</Filter>
</ClCompile>
<ClCompile Include="Math\math_util.cpp">
<Filter>Math</Filter>
</ClCompile>
<ClCompile Include="Math\lin\matrix4x4.cpp">
<Filter>Math\lin</Filter>
</ClCompile>
<ClCompile Include="Math\lin\vec3.cpp">
<Filter>Math\lin</Filter>
</ClCompile>
<ClCompile Include="Math\fast\fast_math.c">
<Filter>Math\fast</Filter>
</ClCompile>
<ClCompile Include="Math\fast\fast_matrix.c">
<Filter>Math\fast</Filter>
</ClCompile>
<ClCompile Include="Math\fast\fast_matrix_sse.c">
<Filter>Math\fast</Filter>
</ClCompile>
<ClCompile Include="Data\Format\RIFF.cpp">
<Filter>Data\Format</Filter>
</ClCompile>
<ClCompile Include="File\DiskFree.cpp">
<Filter>File</Filter>
</ClCompile>
<ClCompile Include="File\PathBrowser.cpp">
<Filter>File</Filter>
</ClCompile>
<ClCompile Include="File\VFS\VFS.cpp">
<Filter>File\VFS</Filter>
</ClCompile>
<ClCompile Include="File\VFS\AssetReader.cpp">
<Filter>File\VFS</Filter>
</ClCompile>
<ClCompile Include="Data\Format\IniFile.cpp">
<Filter>Data\Format</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@ -383,10 +471,39 @@
<Filter Include="Data\Color">
<UniqueIdentifier>{1ada1f0f-6f1c-4bf2-8450-1fc63d77da17}</UniqueIdentifier>
</Filter>
<Filter Include="Math">
<UniqueIdentifier>{9f70c234-1671-49db-aa45-1a6a75698a40}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Convert">
<UniqueIdentifier>{98967255-542c-490d-9183-a4b21c074703}</UniqueIdentifier>
</Filter>
<Filter Include="Math\lin">
<UniqueIdentifier>{aa083b68-34ed-4679-a8de-1797a00a1772}</UniqueIdentifier>
</Filter>
<Filter Include="Math\fast">
<UniqueIdentifier>{ffa5052d-e78f-4c47-a43e-e3537c5e7ad0}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Format">
<UniqueIdentifier>{3eebbd6c-0c35-4dac-9869-5d38419432a6}</UniqueIdentifier>
</Filter>
<Filter Include="File">
<UniqueIdentifier>{d9e60709-9bf4-4bc7-b902-742219df7ffb}</UniqueIdentifier>
</Filter>
<Filter Include="File\VFS">
<UniqueIdentifier>{b10822cf-4cc0-4bc3-91a9-b20cb66e5cbd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">
<Filter>ext\libpng17</Filter>
</Text>
</ItemGroup>
<ItemGroup>
<None Include="Math\lin\matrix_neon.s">
<Filter>Math\lin</Filter>
</None>
<None Include="Math\fast\fast_matrix_neon.S">
<Filter>Math\fast</Filter>
</None>
</ItemGroup>
</Project>

8
Common/CommonTypes.h
View File

@ -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;

2
ext/native/math/dataconv.cpp → Common/Data/Convert/SmallDataConvert.cpp
View File

@ -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, };

0
ext/native/math/dataconv.h → Common/Data/Convert/SmallDataConvert.h
View File

4
ext/native/file/ini_file.cpp → Common/Data/Format/IniFile.cpp
View File

@ -16,8 +16,8 @@
#include <string>
#include <vector>
#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

0
ext/native/file/ini_file.h → Common/Data/Format/IniFile.h
View File

5
ext/native/file/chunk_file.cpp → Common/Data/Format/RIFF.cpp
View File

@ -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);

2
ext/native/file/chunk_file.h → Common/Data/Format/RIFF.h
View File

@ -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:

4
Common/Data/Text/I18n.cpp
View File

@ -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"

0
ext/native/file/free.cpp → Common/File/DiskFree.cpp
View File

0
ext/native/file/free.h → Common/File/DiskFree.h
View File

8
ext/native/file/path.cpp → Common/File/PathBrowser.cpp
View File

@ -2,12 +2,12 @@
#include <cstring>
#include <set>
#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<FileInfo> &files) {

4
ext/native/file/path.h → Common/File/PathBrowser.h
View File

@ -3,7 +3,7 @@
#include <condition_variable>
#include <mutex>
#include <string>
#include <string.h>
#include <cstring>
#include <thread>
#include <vector>
#include <stdlib.h>
@ -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, '~');
}

146
ext/native/file/zip_read.cpp → Common/File/VFS/AssetReader.cpp
View File

@ -7,10 +7,9 @@
#include <zip.h>
#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<FileInfo> *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;
}

2
ext/native/file/zip_read.h → Common/File/VFS/AssetReader.h
View File

@ -8,7 +8,7 @@
#include <string.h>
#include <string>
#include "file/vfs.h"
#include "Common/File/VFS/VFS.h"
#include "file/file_util.h"
// Direct readers. deallocate using delete [].

118
Common/File/VFS/VFS.cpp Normal file
View File

@ -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<FileInfo> *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;
}

0
ext/native/file/vfs.h → Common/File/VFS/VFS.h
View File

1
Common/FileUtil.h
View File

@ -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

2
Common/Input/GestureDetector.h
View File

@ -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.

2
Common/Input/InputState.h
View File

@ -7,7 +7,7 @@
#include <vector>
#include <mutex>
#include "math/lin/vec3.h"
#include "Common/Math/lin/vec3.h"
#include "Common/Input/KeyCodes.h"
// Default device IDs

2
Common/LogManager.h
View File

@ -23,7 +23,7 @@
#include <mutex>
#include <vector>
#include "file/ini_file.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/CommonFuncs.h"
#include "Common/Log.h"

2
ext/native/math/curves.cpp → Common/Math/curves.cpp
View File

@ -1,7 +1,7 @@
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "curves.h"
#include "Common/Common.h"

0
ext/native/math/curves.h → Common/Math/curves.h
View File

24
ext/native/math/expression_parser.cpp → Common/Math/expression_parser.cpp
View File

@ -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;
}

0
ext/native/math/expression_parser.h → Common/Math/expression_parser.h
View File

0
ext/native/math/fast/fast_math.c → Common/Math/fast/fast_math.c
View File

0
ext/native/math/fast/fast_math.h → Common/Math/fast/fast_math.h
View File

0
ext/native/math/fast/fast_matrix.c → Common/Math/fast/fast_matrix.c
View File

0
ext/native/math/fast/fast_matrix.h → Common/Math/fast/fast_matrix.h
View File

0
ext/native/math/fast/fast_matrix_neon.S → Common/Math/fast/fast_matrix_neon.S
View File

0
ext/native/math/fast/fast_matrix_sse.c → Common/Math/fast/fast_matrix_sse.c
View File

0
ext/native/math/geom2d.h → Common/Math/geom2d.h
View File

6
ext/native/math/lin/matrix4x4.cpp → Common/Math/lin/matrix4x4.cpp
View File

@ -1,9 +1,9 @@
#include "math/lin/matrix4x4.h"
#include "Common/Math/lin/matrix4x4.h"
#include <cstdio>
#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

2
ext/native/math/lin/matrix4x4.h → Common/Math/lin/matrix4x4.h
View File

@ -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 {

0
ext/native/math/lin/matrix_neon.s → Common/Math/lin/matrix_neon.s
View File

4
ext/native/math/lin/vec3.cpp → Common/Math/lin/vec3.cpp
View File

@ -1,7 +1,7 @@
#include <stdio.h>
#include "math/lin/vec3.h"
#include "math/lin/matrix4x4.h"
#include "Common/Math/lin/vec3.h"
#include "Common/Math/lin/matrix4x4.h"
namespace Lin {

0
ext/native/math/lin/vec3.h → Common/Math/lin/vec3.h
View File

2
ext/native/math/math_util.cpp → Common/Math/math_util.cpp
View File

@ -1,4 +1,4 @@
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include <stdlib.h>
// QNX can only use RunFast mode and it is already the default.

0
ext/native/math/math_util.h → Common/Math/math_util.h
View File

2
Common/Vulkan/VulkanMemory.cpp
View File

@ -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"

3
Core/Compatibility.cpp
View File

@ -16,7 +16,8 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <cstring>
#include "file/ini_file.h"
#include "Common/Data/Format/IniFile.h"
#include "Core/Compatibility.h"
#include "Core/System.h"

4
Core/Config.cpp
View File

@ -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"

2
Core/Core.vcxproj
View File

@ -453,6 +453,7 @@
<ClCompile Include="HW\BufferQueue.cpp" />
<ClCompile Include="HW\Camera.cpp" />
<ClCompile Include="Instance.cpp" />
<ClCompile Include="KeyMap.cpp" />
<ClCompile Include="MemFault.cpp" />
<ClCompile Include="MIPS\IR\IRAsm.cpp" />
<ClCompile Include="MIPS\IR\IRCompALU.cpp" />
@ -996,6 +997,7 @@
<ClInclude Include="HLE\sceUsbMic.h" />
<ClInclude Include="HW\Camera.h" />
<ClInclude Include="Instance.h" />
<ClInclude Include="KeyMap.h" />
<ClInclude Include="MemFault.h" />
<ClInclude Include="MIPS\IR\IRFrontend.h" />
<ClInclude Include="MIPS\IR\IRInst.h" />

6
Core/Core.vcxproj.filters
View File

@ -959,6 +959,9 @@
<ClCompile Include="..\ext\libzip\zip_unchange_data.c">
<Filter>Ext\libzip</Filter>
</ClCompile>
<ClCompile Include="KeyMap.cpp">
<Filter>Core</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ELF\ElfReader.h">
@ -1637,6 +1640,9 @@
<ClInclude Include="..\ext\libzip\zipint.h">
<Filter>Ext\libzip</Filter>
</ClInclude>
<ClInclude Include="KeyMap.h">
<Filter>Core</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />

2
Core/Debugger/DebugInterface.h
View File

@ -19,7 +19,7 @@
#include <string>
#include <cstdio>
#include "Common/CommonTypes.h"
#include "math/expression_parser.h"
#include "Common/Math/expression_parser.h"
struct MemMap;

2
Core/Dialog/PSPOskDialog.cpp
View File

@ -18,7 +18,7 @@
#include <algorithm>
#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"

2
Core/FileLoaders/DiskCachingFileLoader.cpp
View File

@ -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"

4
Core/FileSystems/DirectoryFileSystem.cpp
View File

@ -20,14 +20,14 @@
#include <algorithm>
#include <limits>
#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"

1
Core/FileSystems/VirtualDiscFileSystem.cpp
View File

@ -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

2
Core/HLE/Plugins.cpp
View File

@ -17,7 +17,7 @@
#include <set>
#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"

12
Core/HLE/sceJpeg.cpp
View File

@ -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() {

2
Core/HLE/sceUtility.cpp
View File

@ -18,7 +18,7 @@
#include <algorithm>
#include <set>
#include "file/ini_file.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

4
Common/KeyMap.cpp → Core/KeyMap.cpp
View File

@ -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 {

0
Common/KeyMap.h → Core/KeyMap.h
View File

2
Core/MIPS/ARM/ArmCompVFPU.cpp
View File

@ -19,7 +19,7 @@
#if PPSSPP_ARCH(ARM)
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Core/Compatibility.h"
#include "Core/Config.h"

2
Core/MIPS/ARM/ArmCompVFPUNEON.cpp
View File

@ -30,7 +30,7 @@
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/CPUDetect.h"
#include "Core/MemMap.h"

2
Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp
View File

@ -30,7 +30,7 @@
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/CPUDetect.h"
#include "Core/MemMap.h"

2
Core/MIPS/ARM64/Arm64CompVFPU.cpp
View File

@ -19,7 +19,7 @@
#if PPSSPP_ARCH(ARM64)
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Core/Compatibility.h"
#include "Core/Config.h"

2
Core/MIPS/IR/IRCompVFPU.cpp
View File

@ -17,7 +17,7 @@
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/CPUDetect.h"
#include "Core/Compatibility.h"

2
Core/MIPS/IR/IRInterpreter.cpp
View File

@ -2,7 +2,7 @@
#include <cmath>
#include "ppsspp_config.h"
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/Common.h"
#include "Common/BitScan.h"

2
Core/MIPS/MIPS.cpp
View File

@ -18,7 +18,7 @@
#include <cmath>
#include <limits>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common.h"
#include "Common/Serialize/Serializer.h"

2
Core/MIPS/MIPSInt.cpp
View File

@ -17,7 +17,7 @@
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/BitSet.h"
#include "Common/BitScan.h"

2
Core/MIPS/MIPSIntVFPU.cpp
View File

@ -21,7 +21,7 @@
#include <limits>
#include <algorithm>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Core/Compatibility.h"
#include "Core/Core.h"

2
Core/MIPS/x86/Asm.cpp
View File

@ -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"

2
Core/MIPS/x86/CompVFPU.cpp
View File

@ -25,7 +25,7 @@
#include <limits>
#include <emmintrin.h>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/CPUDetect.h"
#include "Common/Log.h"

2
Core/MIPS/x86/Jit.cpp
View File

@ -21,7 +21,7 @@
#include <algorithm>
#include <iterator>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "profiler/profiler.h"
#include "Common/Serialize/Serializer.h"

5
Core/Reporting.cpp
View File

@ -24,7 +24,7 @@
#include <cstdarg>
#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
{

2
Core/System.cpp
View File

@ -33,7 +33,7 @@
#include <condition_variable>
#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"

2
Core/TextureReplacer.cpp
View File

@ -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"

2
Core/Util/GameManager.cpp
View File

@ -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"

2
Core/Util/PPGeDraw.cpp
View File

@ -18,7 +18,7 @@
#include <algorithm>
#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"

4
GPU/Common/PostShader.cpp
View File

@ -22,9 +22,9 @@
#include <vector>
#include <algorithm>
#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"

2
GPU/Common/PostShader.h
View File

@ -22,7 +22,7 @@
#include <string>
#include <vector>
#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

4
GPU/Common/PresentationCommon.cpp
View File

@ -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"

8
GPU/Common/ShaderUniforms.cpp
View File

@ -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"

2
GPU/Common/SoftwareTransformCommon.cpp
View File

@ -17,7 +17,7 @@
#include <algorithm>
#include <cmath>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "gfx_es2/gpu_features.h"
#include "Core/Config.h"

2
GPU/D3D11/FramebufferManagerD3D11.cpp
View File

@ -20,7 +20,7 @@
#include <D3Dcompiler.h>
#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"

6
GPU/D3D11/ShaderManagerD3D11.cpp
View File

@ -22,9 +22,9 @@
#include <map>
#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"

2
GPU/D3D11/StateMappingD3D11.cpp
View File

@ -20,7 +20,7 @@
#include <algorithm>
#include "math/dataconv.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "GPU/Math3D.h"
#include "GPU/GPUState.h"

2
GPU/D3D11/TextureCacheD3D11.cpp
View File

@ -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)

2
GPU/Directx9/FramebufferManagerDX9.cpp
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 "math/lin/matrix4x4.h"
#include "Common/Math/lin/matrix4x4.h"
#include "ext/native/thin3d/thin3d.h"
#include "Common/ColorConv.h"

6
GPU/Directx9/ShaderManagerDX9.cpp
View File

@ -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"

2
GPU/Directx9/ShaderManagerDX9.h
View File

@ -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 {

2
GPU/Directx9/TextureCacheDX9.cpp
View File

@ -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 {

6
GPU/GLES/ShaderManagerGLES.cpp
View File

@ -23,12 +23,12 @@
#include <cstdio>
#include <map>
#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"

2
GPU/GLES/TextureCacheGLES.cpp
View File

@ -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"

2
GPU/Math3D.h
View File

@ -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 <emmintrin.h>

2
GPU/Software/TransformUnit.cpp
View File

@ -18,7 +18,7 @@
#include <cmath>
#include <algorithm>
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/MemoryUtil.h"
#include "Core/Config.h"
#include "GPU/GPUState.h"

2
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -17,7 +17,7 @@
#include <algorithm>
#include "math/dataconv.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "profiler/profiler.h"
#include "thin3d/VulkanRenderManager.h"

4
GPU/Vulkan/FramebufferManagerVulkan.cpp
View File

@ -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"

6
GPU/Vulkan/ShaderManagerVulkan.cpp
View File

@ -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"

2
GPU/Vulkan/ShaderManagerVulkan.h
View File

@ -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;

2
GPU/Vulkan/StateMappingVulkan.cpp
View File

@ -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"

4
GPU/Vulkan/TextureCacheVulkan.cpp
View File

@ -19,9 +19,9 @@
#include <cstring>
#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"

2
Qt/QtMain.cpp
View File

@ -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"

2
SDL/SDLJoystick.cpp
View File

@ -2,7 +2,7 @@
#include <string>
#include "base/NativeApp.h"
#include "file/vfs.h"
#include "Common/File/VFS/VFS.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"

2
SDL/SDLMain.cpp
View File

@ -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"

4
UI/BackgroundAudio.cpp
View File

@ -1,11 +1,11 @@
#include <string>
#include <mutex>
#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"

Some files were not shown because too many files have changed in this diff Show More