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

Merge pull request #13496 from hrydgard/more-native-file-moves

Browse Source 
More native file moves (input, thread)
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2020-10-01 10:53:53 +02:00
2 parents ef08c0237f 342ed97291
commit 93d8bbc529
99 files changed
+251 -259
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+13 -13
View File
@@ -433,6 +433,19 @@ add_library(Common STATIC
Common/Crypto/sha1.h
Common/Crypto/sha256.cpp
Common/Crypto/sha256.h
Common/Input/GestureDetector.cpp
Common/Input/GestureDetector.h
Common/Input/KeyCodes.h
Common/Input/InputState.cpp
Common/Input/InputState.h
Common/Thread/Executor.cpp
Common/Thread/Executor.h
Common/Thread/PrioritizedWorkQueue.cpp
Common/Thread/PrioritizedWorkQueue.h
Common/Thread/ThreadUtil.cpp
Common/Thread/ThreadUtil.h
Common/Thread/ThreadPool.cpp
Common/Thread/ThreadPool.h
Common/BitScan.h
Common/BitSet.h
Common/Buffer.h
@@ -1000,11 +1013,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/input/gesture_detector.cpp
ext/native/input/gesture_detector.h
ext/native/input/keycodes.h
ext/native/input/input_state.h
ext/native/input/input_state.cpp
ext/native/json/json_reader.h
ext/native/json/json_reader.cpp
ext/native/json/json_writer.h
@@ -1045,14 +1053,6 @@ add_library(native STATIC
ext/native/thin3d/thin3d.h
ext/native/thin3d/thin3d_create.h
${THIN3D_PLATFORMS}
ext/native/thread/executor.cpp
ext/native/thread/executor.h
ext/native/thread/prioritizedworkqueue.cpp
ext/native/thread/prioritizedworkqueue.h
ext/native/thread/threadutil.cpp
ext/native/thread/threadutil.h
ext/native/thread/threadpool.cpp
ext/native/thread/threadpool.h
ext/native/ui/root.cpp
ext/native/ui/root.h
ext/native/ui/screen.cpp
Common/Common.vcxproj
+14 -1
View File
@@ -360,6 +360,9 @@
<ClInclude Include="BitSet.h" />
<ClInclude Include="Buffer.h" />
<ClInclude Include="FakeEmitter.h" />
<ClInclude Include="Input\GestureDetector.h" />
<ClInclude Include="Input\InputState.h" />
<ClInclude Include="Input\KeyCodes.h" />
<ClInclude Include="Serialize\SerializeDeque.h" />
<ClInclude Include="Serialize\SerializeFuncs.h" />
<ClInclude Include="ColorConvNEON.h" />
@@ -420,6 +423,10 @@
<ClInclude Include="SysError.h" />
<ClInclude Include="ThreadPools.h" />
<ClInclude Include="ThreadSafeList.h" />
<ClInclude Include="Thread\Executor.h" />
<ClInclude Include="Thread\PrioritizedWorkQueue.h" />
<ClInclude Include="Thread\ThreadPool.h" />
<ClInclude Include="Thread\ThreadUtil.h" />
<ClInclude Include="Thunk.h" />
<ClInclude Include="Timer.h" />
<ClInclude Include="TimeUtil.h" />
@@ -607,6 +614,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Input\GestureDetector.cpp" />
<ClCompile Include="Input\InputState.cpp" />
<ClCompile Include="Log.cpp" />
<ClCompile Include="Serialize\Serializer.cpp" />
<ClCompile Include="ColorConv.cpp" />
@@ -659,6 +668,10 @@
<ClCompile Include="OSVersion.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="ThreadPools.cpp" />
<ClCompile Include="Thread\Executor.cpp" />
<ClCompile Include="Thread\PrioritizedWorkQueue.cpp" />
<ClCompile Include="Thread\ThreadPool.cpp" />
<ClCompile Include="Thread\ThreadUtil.cpp" />
<ClCompile Include="Thunk.cpp" />
<ClCompile Include="Timer.cpp" />
<ClCompile Include="TimeUtil.cpp" />
@@ -681,4 +694,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Common/Common.vcxproj.filters
+46 -1
View File
@@ -116,6 +116,27 @@
<ClInclude Include="..\ext\libpng17\pngstruct.h">
<Filter>ext\libpng17</Filter>
</ClInclude>
<ClInclude Include="Thread\PrioritizedWorkQueue.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="Thread\ThreadPool.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="Thread\ThreadUtil.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="Thread\Executor.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="Input\GestureDetector.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="Input\InputState.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="Input\KeyCodes.h">
<Filter>Input</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@@ -231,6 +252,24 @@
<ClCompile Include="..\ext\libpng17\pngwutil.c">
<Filter>ext\libpng17</Filter>
</ClCompile>
<ClCompile Include="Thread\PrioritizedWorkQueue.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="Thread\ThreadPool.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="Thread\ThreadUtil.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="Thread\Executor.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="Input\GestureDetector.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="Input\InputState.cpp">
<Filter>Input</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@@ -254,10 +293,16 @@
<Filter Include="ext\libpng17">
<UniqueIdentifier>{1d04f87f-73a2-4027-a6ff-e998e92e7d3c}</UniqueIdentifier>
</Filter>
<Filter Include="Thread">
<UniqueIdentifier>{41bcd391-8641-432c-ae4a-ab03812df762}</UniqueIdentifier>
</Filter>
<Filter Include="Input">
<UniqueIdentifier>{fd0bac4f-e3e2-4201-8902-2d19b50d5bf7}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">
<Filter>ext\libpng17</Filter>
</Text>
</ItemGroup>
</Project>
</Project>
Common/ConsoleListener.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#endif
#include "ppsspp_config.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Common.h"
#include "Common/ConsoleListener.h"
Common/ExceptionHandlerSetup.cpp
+2 -3
View File
@@ -6,7 +6,6 @@
#include "ppsspp_config.h"
#include "Common/ExceptionHandlerSetup.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -16,9 +15,9 @@
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/Log.h"
#include "ext/native/thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/MachineContext.h"
#include "Common/ExceptionHandlerSetup.h"
static BadAccessHandler g_badAccessHandler;
static void *altStack = nullptr;
ext/native/input/gesture_detector.cpp → Common/Input/GestureDetector.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
// Zoom gesture a la http://www.zdnet.com/blog/burnette/how-to-use-multi-touch-in-android-2-part-6-implementing-the-pinch-zoom-gesture/1847
#include "Common/TimeUtil.h"
#include "input/gesture_detector.h"
#include "Common/Input/GestureDetector.h"
const float estimatedInertiaDamping = 0.75f;
ext/native/input/gesture_detector.h → Common/Input/GestureDetector.h
+1 -1
View File
@@ -1,4 +1,4 @@
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "math/geom2d.h"
// Mainly for detecting (multi-)touch gestures but also useable for left button mouse dragging etc.
ext/native/input/input_state.cpp → Common/Input/InputState.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include <vector>
const char *GetDeviceName(int deviceId) {
ext/native/input/input_state.h → Common/Input/InputState.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include <mutex>
#include "math/lin/vec3.h"
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
// Default device IDs
ext/native/input/keycodes.h → Common/Input/KeyCodes.h
View File
File renamed without changes.
Common/KeyMap.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "base/NativeApp.h"
#include "file/ini_file.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "ppsspp_config.h"
#include "Common/Log.h"
Common/KeyMap.h
+2 -2
View File
@@ -21,8 +21,8 @@
#include <map>
#include <vector>
#include <set>
#include "input/input_state.h" // KeyDef
#include "input/keycodes.h" // keyboard keys
#include "Common/Input/InputState.h" // KeyDef
#include "Common/Input/KeyCodes.h" // keyboard keys
#include "../Core/HLE/sceCtrl.h" // psp keys
#define KEYMAP_ERROR_KEY_ALREADY_USED -1
ext/native/thread/executor.cpp → Common/Thread/Executor.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "thread/executor.h"
#include "Common/Thread/Executor.h"
#include <functional>
#include <thread>
ext/native/thread/executor.h → Common/Thread/Executor.h
View File
File renamed without changes.
ext/native/thread/prioritizedworkqueue.cpp → Common/Thread/PrioritizedWorkQueue.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <thread>
#include "Common/TimeUtil.h"
#include "thread/prioritizedworkqueue.h"
#include "Common/Thread/PrioritizedWorkQueue.h"
#include "Common/Log.h"
ext/native/thread/prioritizedworkqueue.h → Common/Thread/PrioritizedWorkQueue.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include <mutex>
#include <condition_variable>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Common.h"
ext/native/thread/threadpool.cpp → Common/Thread/ThreadPool.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include "thread/threadpool.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadPool.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
#include "Common/MakeUnique.h"
ext/native/thread/threadpool.h → Common/Thread/ThreadPool.h
View File
File renamed without changes.
ext/native/thread/threadutil.cpp → Common/Thread/ThreadUtil.cpp
+1 -2
View File
@@ -11,9 +11,8 @@
#include <cstring>
#include <cstdint>
#include "thread/threadutil.h"
#include "Common/Log.h"
#include "Common/Thread/ThreadUtil.h"
#if defined(__ANDROID__) || defined(__APPLE__) || (defined(__GLIBC__) && defined(_GNU_SOURCE))
#include <pthread.h>
ext/native/thread/threadutil.h → Common/Thread/ThreadUtil.h
View File
File renamed without changes.
Common/ThreadPools.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "thread/threadpool.h"
#include "Common/Thread/ThreadPool.h"
class GlobalThreadPool {
public:
Core/Core.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "base/NativeApp.h"
#include "base/display.h"
#include "Common/TimeUtil.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "profiler/profiler.h"
#include "Common/GraphicsContext.h"
Core/Debugger/WebSocket.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
#include <mutex>
#include <condition_variable>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Core/Debugger/WebSocket.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"
#include "Core/MemMap.h"
Core/Dialog/PSPSaveDialog.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <thread>
#include "i18n/i18n.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
#include "Common/Serialize/Serializer.h"
Core/FileLoaders/CachingFileLoader.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <thread>
#include <algorithm>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/TimeUtil.h"
#include "Core/FileLoaders/CachingFileLoader.h"
Core/FileLoaders/RamCachingFileLoader.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <cstring>
#include <cstdlib>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/TimeUtil.h"
#include "Core/FileLoaders/RamCachingFileLoader.h"
Core/HLE/proAdhoc.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include <cstring>
#include "i18n/i18n.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/Serialize/SerializeFuncs.h"
Core/HLE/proAdhocServer.cpp
+1 -1
View File
@@ -50,7 +50,7 @@
#endif
#include "i18n/i18n.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
#include "Common/TimeUtil.h"
Core/HLE/sceIo.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <set>
#include <thread>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "profiler/profiler.h"
#include "Common/FileUtil.h"
Core/HLE/sceNetAdhoc.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
#endif
#include <mutex>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
// sceNetAdhoc
// This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
Core/HLE/sceSas.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include <condition_variable>
#include "profiler/profiler.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/Log.h"
#include "Core/Config.h"
Core/HW/Camera.h
+1 -1
View File
@@ -57,7 +57,7 @@ void __cameraDummyImage(int width, int height, unsigned char** outData, int* out
#include <sys/ioctl.h>
#include <sys/mman.h>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
typedef struct {
void *start;
Core/PSPLoaders.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "file/file_util.h"
#include "util/text/utf8.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
Core/Reporting.cpp
+1 -1
View File
@@ -48,7 +48,7 @@
#include "net/resolve.h"
#include "net/url.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "file/zip_read.h"
namespace Reporting
Core/SaveState.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <mutex>
#include "i18n/i18n.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/FileUtil.h"
Core/System.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "base/NativeApp.h"
#include "math/math_util.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/FileUtil.h"
Core/Util/PortManager.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include "Common/TimeUtil.h"
#include "i18n/i18n.h"
#include "net/resolve.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
#include "Core/System.h"
#include "Core/Host.h"
Core/WebServer.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "net/http_client.h"
#include "net/http_server.h"
#include "net/sinks.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
#include "Common/FileUtil.h"
#include "Common/TimeUtil.h"
Qt/QtMain.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "math/math_util.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
Qt/QtMain.h
+2 -2
View File
@@ -27,8 +27,8 @@ QTM_USE_NAMESPACE
#include "file/zip_read.h"
#include "gfx/gl_common.h"
#include "gfx_es2/gpu_features.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "thin3d/thin3d.h"
#include "base/NativeApp.h"
#include "net/resolve.h"
SDL/SDLJoystick.h
+2 -2
View File
@@ -7,8 +7,8 @@
#include "SDL_thread.h"
#endif
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "net/resolve.h"
#include "base/NativeApp.h"
SDL/SDLMain.cpp
+3 -3
View File
@@ -24,15 +24,15 @@ SDLJoystick *joystick = NULL;
#include "Common/TimeUtil.h"
#include "ext/glslang/glslang/Public/ShaderLang.h"
#include "image/png_load.h"
#include "input/input_state.h"
#include "input/keycodes.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 "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "math.h"
#include "SDL_syswm.h"
UI/ControlMappingScreen.cpp
+2 -2
View File
@@ -23,8 +23,8 @@
#include "base/display.h"
#include "gfx/texture_atlas.h"
#include "i18n/i18n.h"
#include "input/keycodes.h"
#include "input/input_state.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Input/InputState.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
UI/EmuScreen.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "gfx_es2/gpu_features.h"
#include "gfx_es2/draw_text.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "math/curves.h"
#include "ui/root.h"
#include "ui/ui.h"
UI/EmuScreen.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include <vector>
#include <list>
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
#include "ui/screen.h"
#include "ui/ui_screen.h"
#include "ui/ui_tween.h"
UI/GameInfoCache.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "file/file_util.h"
#include "file/zip_read.h"
#include "thin3d/thin3d.h"
#include "thread/prioritizedworkqueue.h"
#include "Common/Thread/PrioritizedWorkQueue.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
UI/GamepadEmu.h
+1 -1
View File
@@ -17,7 +17,7 @@
#pragma once
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "gfx_es2/draw_buffer.h"
#include "ui/view.h"
UI/NativeApp.cpp
+1 -1
View File
@@ -53,7 +53,7 @@
#include "gfx_es2/draw_text.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "math/fast/fast_math.h"
#include "math/math_util.h"
#include "math/lin/matrix4x4.h"
UI/SavedataScreen.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "gfx_es2/draw_buffer.h"
#include "i18n/i18n.h"
#include "math/curves.h"
#include "thread/prioritizedworkqueue.h"
#include "Common/Thread/PrioritizedWorkQueue.h"
#include "util/text/utf8.h"
#include "ui/ui_context.h"
#include "ui/view.h"
UWP/App.cpp
+1 -1
View File
@@ -5,8 +5,8 @@
#include <mutex>
#include "input/input_state.h"
#include "base/NativeApp.h"
#include "Common/Input/InputState.h"
#include "Core/System.h"
#include "Core/Core.h"
UWP/CommonUWP/CommonUWP.vcxproj
+13
View File
@@ -386,6 +386,9 @@
<ClInclude Include="..\..\Common\BitScan.h" />
<ClInclude Include="..\..\Common\BitSet.h" />
<ClInclude Include="..\..\Common\Buffer.h" />
<ClInclude Include="..\..\Common\Input\GestureDetector.h" />
<ClInclude Include="..\..\Common\Input\InputState.h" />
<ClInclude Include="..\..\Common\Input\KeyCodes.h" />
<ClInclude Include="..\..\Common\Serialize\Serializer.h" />
<ClInclude Include="..\..\Common\Serialize\SerializeDeque.h" />
<ClInclude Include="..\..\Common\Serialize\SerializeFuncs.h" />
@@ -422,6 +425,10 @@
<ClInclude Include="..\..\Common\SysError.h" />
<ClInclude Include="..\..\Common\ThreadPools.h" />
<ClInclude Include="..\..\Common\ThreadSafeList.h" />
<ClInclude Include="..\..\Common\Thread\Executor.h" />
<ClInclude Include="..\..\Common\Thread\PrioritizedWorkQueue.h" />
<ClInclude Include="..\..\Common\Thread\ThreadPool.h" />
<ClInclude Include="..\..\Common\Thread\ThreadUtil.h" />
<ClInclude Include="..\..\Common\Thunk.h" />
<ClInclude Include="..\..\Common\Timer.h" />
<ClInclude Include="..\..\Common\TimeUtil.h" />
@@ -442,6 +449,8 @@
<ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
<ClCompile Include="..\..\Common\ArmEmitter.cpp" />
<ClCompile Include="..\..\Common\Buffer.cpp" />
<ClCompile Include="..\..\Common\Input\GestureDetector.cpp" />
<ClCompile Include="..\..\Common\Input\InputState.cpp" />
<ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
<ClCompile Include="..\..\Common\ColorConv.cpp" />
<ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
@@ -466,6 +475,10 @@
<ClCompile Include="..\..\Common\OSVersion.cpp" />
<ClCompile Include="..\..\Common\StringUtils.cpp" />
<ClCompile Include="..\..\Common\ThreadPools.cpp" />
<ClCompile Include="..\..\Common\Thread\Executor.cpp" />
<ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp" />
<ClCompile Include="..\..\Common\Thread\ThreadPool.cpp" />
<ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp" />
<ClCompile Include="..\..\Common\Thunk.cpp" />
<ClCompile Include="..\..\Common\Timer.cpp" />
<ClCompile Include="..\..\Common\TimeUtil.cpp" />
UWP/CommonUWP/CommonUWP.vcxproj.filters
+45
View File
@@ -10,6 +10,12 @@
<Filter Include="ext\libpng17">
<UniqueIdentifier>{b0ac485c-3153-4708-b098-f5a518a95b79}</UniqueIdentifier>
</Filter>
<Filter Include="Thread">
<UniqueIdentifier>{819c6967-1ed6-4fec-8415-a018ae524180}</UniqueIdentifier>
</Filter>
<Filter Include="Input">
<UniqueIdentifier>{7368a8e7-cf29-49e9-87be-f1e69771555e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Common\ABI.cpp" />
@@ -100,6 +106,24 @@
<ClCompile Include="..\..\ext\libpng17\pngwutil.c">
<Filter>ext\libpng17</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Input\GestureDetector.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Input\InputState.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Thread\Executor.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Thread\ThreadPool.cpp">
<Filter>Thread</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp">
<Filter>Thread</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="targetver.h" />
@@ -178,6 +202,27 @@
<ClInclude Include="..\..\ext\libpng17\pngstruct.h">
<Filter>ext\libpng17</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Input\GestureDetector.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Input\InputState.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Input\KeyCodes.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Thread\Executor.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Thread\PrioritizedWorkQueue.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Thread\ThreadPool.h">
<Filter>Thread</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\Thread\ThreadUtil.h">
<Filter>Thread</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\ext\libpng17\CMakeLists.txt">
UWP/NKCodeFromWindowsSystem.h
+1 -1
View File
@@ -2,6 +2,6 @@
#include <map>
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
extern std::map<Windows::System::VirtualKey, int> virtualKeyCodeToNKCode;
UWP/NativeUWP/NativeUWP.vcxproj
+1 -14
View File
@@ -402,9 +402,6 @@
<ClInclude Include="..\..\ext\native\i18n\i18n.h" />
<ClInclude Include="..\..\ext\native\image\png_load.h" />
<ClInclude Include="..\..\ext\native\image\zim_load.h" />
<ClInclude Include="..\..\ext\native\input\gesture_detector.h" />
<ClInclude Include="..\..\ext\native\input\input_state.h" />
<ClInclude Include="..\..\ext\native\input\keycodes.h" />
<ClInclude Include="..\..\ext\native\math\curves.h" />
<ClInclude Include="..\..\ext\native\math\dataconv.h" />
<ClInclude Include="..\..\ext\native\math\expression_parser.h" />
@@ -423,10 +420,6 @@
<ClInclude Include="..\..\ext\native\net\url.h" />
<ClInclude Include="..\..\ext\native\net\websocket_server.h" />
<ClInclude Include="..\..\ext\native\thin3d\thin3d.h" />
<ClInclude Include="..\..\ext\native\thread\executor.h" />
<ClInclude Include="..\..\ext\native\thread\prioritizedworkqueue.h" />
<ClInclude Include="..\..\ext\native\thread\threadpool.h" />
<ClInclude Include="..\..\ext\native\thread\threadutil.h" />
<ClInclude Include="..\..\ext\native\ui\root.h" />
<ClInclude Include="..\..\ext\native\ui\screen.h" />
<ClInclude Include="..\..\ext\native\ui\ui.h" />
@@ -468,8 +461,6 @@
<ClCompile Include="..\..\ext\native\i18n\i18n.cpp" />
<ClCompile Include="..\..\ext\native\image\png_load.cpp" />
<ClCompile Include="..\..\ext\native\image\zim_load.cpp" />
<ClCompile Include="..\..\ext\native\input\gesture_detector.cpp" />
<ClCompile Include="..\..\ext\native\input\input_state.cpp" />
<ClCompile Include="..\..\ext\native\math\curves.cpp" />
<ClCompile Include="..\..\ext\native\math\dataconv.cpp" />
<ClCompile Include="..\..\ext\native\math\expression_parser.cpp" />
@@ -599,10 +590,6 @@
<ClCompile Include="..\..\ext\native\net\websocket_server.cpp" />
<ClCompile Include="..\..\ext\native\thin3d\thin3d.cpp" />
<ClCompile Include="..\..\ext\native\thin3d\thin3d_d3d11.cpp" />
<ClCompile Include="..\..\ext\native\thread\executor.cpp" />
<ClCompile Include="..\..\ext\native\thread\prioritizedworkqueue.cpp" />
<ClCompile Include="..\..\ext\native\thread\threadpool.cpp" />
<ClCompile Include="..\..\ext\native\thread\threadutil.cpp" />
<ClCompile Include="..\..\ext\native\ui\root.cpp" />
<ClCompile Include="..\..\ext\native\ui\screen.cpp" />
<ClCompile Include="..\..\ext\native\ui\ui.cpp" />
@@ -638,4 +625,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
UWP/NativeUWP/NativeUWP.vcxproj.filters
+1 -40
View File
@@ -55,18 +55,6 @@
<ClCompile Include="..\..\ext\native\thin3d\thin3d_d3d11.cpp">
<Filter>thin3d</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\thread\executor.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\thread\prioritizedworkqueue.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\thread\threadpool.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\thread\threadutil.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\util\hash\hash.cpp">
<Filter>util</Filter>
</ClCompile>
@@ -106,12 +94,6 @@
<ClCompile Include="..\..\ext\native\file\zip_read.cpp">
<Filter>file</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\input\gesture_detector.cpp">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\input\input_state.cpp">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\ui\root.cpp">
<Filter>ui</Filter>
</ClCompile>
@@ -226,18 +208,6 @@
<ClInclude Include="..\..\ext\native\thin3d\thin3d.h">
<Filter>thin3d</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\thread\executor.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\thread\prioritizedworkqueue.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\thread\threadpool.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\thread\threadutil.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\util\const_map.h">
<Filter>util</Filter>
</ClInclude>
@@ -292,15 +262,6 @@
<ClInclude Include="..\..\ext\native\file\zip_read.h">
<Filter>file</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\input\gesture_detector.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\input\input_state.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\input\keycodes.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\ui\root.h">
<Filter>ui</Filter>
</ClInclude>
@@ -403,4 +364,4 @@
<Filter>gfx</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>
UWP/PPSSPP_UWPMain.cpp
+2 -2
View File
@@ -4,14 +4,14 @@
#include <mutex>
#include "base/NativeApp.h"
#include "input/input_state.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 "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "thin3d/thin3d_create.h"
#include "util/text/utf8.h"
UWP/PPSSPP_UWPMain.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <mutex>
#include "thin3d/thin3d.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "Common/GraphicsContext.h"
#include "Common/DeviceResources.h"
UWP/StorageFileLoader.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "pch.h"
#include "ppltasks.h"
#include "file/file_util.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "StorageFileLoader.h"
#include "Common/Log.h"
#include "UWPUtil.h"
UWP/StorageFolderBrowser.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "pch.h"
#include "ppltasks.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "StorageFolderBrowser.h"
#include "UWPUtil.h"
UWP/UWPHost.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "file/file_util.h"
#include "base/NativeApp.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "Common/StringUtils.h"
#include "Core/Core.h"
UWP/XAudioSoundStream.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <algorithm>
#include <XAudio2.h>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "XAudioSoundStream.h"
#include <process.h>
Windows/CaptureDevice.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <shlwapi.h>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "CaptureDevice.h"
#include "BufferLock.h"
#include "ext/jpge/jpge.h"
Windows/DSoundStream.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#undef __null
#endif
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
#include "Common/OSVersion.h"
#include "Core/ConfigValues.h"
Windows/DinputDevice.cpp
+2 -2
View File
@@ -23,9 +23,9 @@
#include "Core/HLE/sceCtrl.h"
#include "DinputDevice.h"
#include "Core/Config.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "base/NativeApp.h"
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
#include "Core/Reporting.h"
#include "Xinput.h"
#pragma comment(lib,"dinput8.lib")
Windows/EmuThread.cpp
+2 -2
View File
@@ -4,7 +4,7 @@
#include "base/NativeApp.h"
#include "i18n/i18n.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "util/text/utf8.h"
#include "Common/Log.h"
@@ -23,7 +23,7 @@
#include "Core/System.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
enum class EmuThreadState {
DISABLED,
Windows/InputDevice.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <thread>
#include <atomic>
#include "input/input_state.h"
#include "thread/threadutil.h"
#include "Common/Input/InputState.h"
#include "Common/Thread/ThreadUtil.h"
#include "Core/Config.h"
#include "Core/Host.h"
#include "Windows/InputDevice.h"
Windows/MainWindow.cpp
+3 -3
View File
@@ -37,9 +37,9 @@
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"
#include "i18n/i18n.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "thread/threadutil.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Core/Core.h"
Windows/RawInput.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "base/NativeApp.h"
#include "base/display.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "Common/Log.h"
#include "Windows/RawInput.h"
#include "Windows/MainWindow.h"
Windows/WASAPIStream.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Core/Reporting.h"
#include "Core/Util/AudioFormat.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include <mutex>
#include <Objbase.h>
Windows/WindowsHost.cpp
+2 -2
View File
@@ -35,8 +35,8 @@
#include "base/display.h"
#include "base/NativeApp.h"
#include "file/file_util.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "util/text/utf8.h"
#include "Common/StringUtils.h"
Windows/XinputDevice.cpp
+2 -2
View File
@@ -8,8 +8,8 @@
#include "Common/CommonWindows.h"
#include "Common/KeyMap.h"
#include "Common/Log.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "XinputDevice.h"
#include "Core/Core.h"
#include "Core/HLE/sceCtrl.h"
Windows/main.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include "file/zip_read.h"
#include "i18n/i18n.h"
#include "profiler/profiler.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "net/resolve.h"
android/jni/Android.mk
+6
View File
@@ -233,6 +233,12 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Common/Crypto/md5.cpp \
$(SRC)/Common/Crypto/sha1.cpp \
$(SRC)/Common/Crypto/sha256.cpp \
$(SRC)/Common/Thread/Executor.cpp \
$(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \
$(SRC)/Common/Thread/ThreadPool.cpp \
$(SRC)/Common/Thread/ThreadUtil.cpp \
$(SRC)/Common/Input/GestureDetector.cpp \
$(SRC)/Common/Input/InputState.cpp \
$(SRC)/Common/Serialize/Serializer.cpp \
$(SRC)/Common/ColorConv.cpp \
$(SRC)/Common/ExceptionHandlerSetup.cpp \
android/jni/app-android.cpp
+3 -3
View File
@@ -51,10 +51,10 @@ struct JNIEnv {};
#include "base/display.h"
#include "base/NativeApp.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "file/zip_read.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "profiler/profiler.h"
#include "math/math_util.h"
#include "net/resolve.h"
ext/native/Android.mk
-6
View File
@@ -21,8 +21,6 @@ LOCAL_SRC_FILES :=\
json/json_reader.cpp \
json/json_writer.cpp \
i18n/i18n.cpp \
input/gesture_detector.cpp \
input/input_state.cpp \
math/fast/fast_math.c \
math/fast/fast_matrix.c \
math/dataconv.cpp \
@@ -39,10 +37,6 @@ LOCAL_SRC_FILES :=\
net/url.cpp \
net/websocket_server.cpp \
profiler/profiler.cpp \
thread/executor.cpp \
thread/threadutil.cpp \
thread/prioritizedworkqueue.cpp \
thread/threadpool.cpp \
gfx_es2/glsl_program.cpp \
gfx_es2/gpu_features.cpp \
gfx_es2/gl3stub.c \
ext/native/base/NativeApp.h
+1 -1
View File
@@ -10,7 +10,7 @@
// from the framework, which exposes the native JNI api which is a bit
// more complicated.
// These are defined in input/input_state.h.
// These are defined in Common/Input/InputState.cpp
struct TouchInput;
struct KeyInput;
struct AxisInput;
ext/native/file/path.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "file/path.h"
#include "net/http_client.h"
#include "net/url.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
bool LoadRemoteFileList(const std::string &url, bool *cancel, std::vector<FileInfo> &files) {
http::Client http;
ext/native/input/CMakeLists.txt
-13
View File
@@ -1,13 +0,0 @@
set(SRCS
input_state.cpp
gesture_detector.cpp)
set(SRCS ${SRCS})
add_library(input STATIC ${SRCS})
target_link_libraries(input general gfx)
target_link_libraries(input general file)
if(UNIX)
add_definitions(-fPIC)
endif(UNIX)
ext/native/native.vcxproj
-13
View File
@@ -424,9 +424,6 @@
<ClInclude Include="image\png_load.h" />
<ClInclude Include="image\zim_load.h" />
<ClInclude Include="image\zim_save.h" />
<ClInclude Include="input\gesture_detector.h" />
<ClInclude Include="input\input_state.h" />
<ClInclude Include="input\keycodes.h" />
<ClInclude Include="json\json_writer.h" />
<ClInclude Include="math\curves.h" />
<ClInclude Include="math\dataconv.h" />
@@ -446,10 +443,6 @@
<ClInclude Include="net\sinks.h" />
<ClInclude Include="thin3d\d3dx9_loader.h" />
<ClInclude Include="thin3d\thin3d.h" />
<ClInclude Include="thread\executor.h" />
<ClInclude Include="thread\prioritizedworkqueue.h" />
<ClInclude Include="thread\threadpool.h" />
<ClInclude Include="thread\threadutil.h" />
<ClInclude Include="ui\screen.h" />
<ClInclude Include="ui\ui.h" />
<ClInclude Include="ui\ui_context.h" />
@@ -535,8 +528,6 @@
<ClCompile Include="image\png_load.cpp" />
<ClCompile Include="image\zim_load.cpp" />
<ClCompile Include="image\zim_save.cpp" />
<ClCompile Include="input\gesture_detector.cpp" />
<ClCompile Include="input\input_state.cpp" />
<ClCompile Include="json\json_writer.cpp" />
<ClCompile Include="math\curves.cpp" />
<ClCompile Include="math\expression_parser.cpp" />
@@ -562,10 +553,6 @@
<ClCompile Include="thin3d\thin3d_d3d9.cpp" />
<ClCompile Include="thin3d\thin3d_gl.cpp" />
<ClCompile Include="thin3d\thin3d_vulkan.cpp" />
<ClCompile Include="thread\executor.cpp" />
<ClCompile Include="thread\prioritizedworkqueue.cpp" />
<ClCompile Include="thread\threadpool.cpp" />
<ClCompile Include="thread\threadutil.cpp" />
<ClCompile Include="ui\screen.cpp" />
<ClCompile Include="ui\ui.cpp" />
<ClCompile Include="ui\ui_context.cpp" />
ext/native/native.vcxproj.filters
-45
View File
@@ -50,9 +50,6 @@
<ClInclude Include="profiler\profiler.h">
<Filter>profiler</Filter>
</ClInclude>
<ClInclude Include="input\input_state.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="file\chunk_file.h">
<Filter>file</Filter>
</ClInclude>
@@ -68,9 +65,6 @@
<ClInclude Include="math\math_util.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="input\gesture_detector.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="base\colorutil.h">
<Filter>base</Filter>
</ClInclude>
@@ -119,21 +113,12 @@
<ClInclude Include="util\text\utf8.h">
<Filter>util</Filter>
</ClInclude>
<ClInclude Include="thread\prioritizedworkqueue.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="thread\threadutil.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="i18n\i18n.h">
<Filter>i18n</Filter>
</ClInclude>
<ClInclude Include="file\ini_file.h">
<Filter>file</Filter>
</ClInclude>
<ClInclude Include="thread\threadpool.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="ui\view.h">
<Filter>ui</Filter>
</ClInclude>
@@ -188,15 +173,9 @@
<ClInclude Include="net\http_server.h">
<Filter>net</Filter>
</ClInclude>
<ClInclude Include="thread\executor.h">
<Filter>thread</Filter>
</ClInclude>
<ClInclude Include="gfx\gl_common.h">
<Filter>gfx</Filter>
</ClInclude>
<ClInclude Include="input\keycodes.h">
<Filter>input</Filter>
</ClInclude>
<ClInclude Include="file\free.h">
<Filter>file</Filter>
</ClInclude>
@@ -313,9 +292,6 @@
<ClCompile Include="gfx\texture_atlas.cpp">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="input\gesture_detector.cpp">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="base\colorutil.cpp">
<Filter>base</Filter>
</ClCompile>
@@ -361,21 +337,12 @@
<ClCompile Include="util\text\utf8.cpp">
<Filter>util</Filter>
</ClCompile>
<ClCompile Include="thread\prioritizedworkqueue.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="thread\threadutil.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="i18n\i18n.cpp">
<Filter>i18n</Filter>
</ClCompile>
<ClCompile Include="file\ini_file.cpp">
<Filter>file</Filter>
</ClCompile>
<ClCompile Include="thread\threadpool.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="ui\view.cpp">
<Filter>ui</Filter>
</ClCompile>
@@ -394,9 +361,6 @@
<ClCompile Include="math\expression_parser.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="input\input_state.cpp">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="gfx_es2\draw_text.cpp">
<Filter>gfx</Filter>
</ClCompile>
@@ -436,9 +400,6 @@
<ClCompile Include="net\http_server.cpp">
<Filter>net</Filter>
</ClCompile>
<ClCompile Include="thread\executor.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="..\..\SDL\SDLMain.cpp">
<Filter>base</Filter>
</ClCompile>
@@ -531,9 +492,6 @@
<Filter Include="profiler">
<UniqueIdentifier>{c57b41dd-cc33-46ac-b479-19676455ae54}</UniqueIdentifier>
</Filter>
<Filter Include="input">
<UniqueIdentifier>{4ba4474c-b80f-40da-95e8-2de57eb1b327}</UniqueIdentifier>
</Filter>
<Filter Include="file">
<UniqueIdentifier>{49afd06e-eb44-41ac-b038-e109e444a834}</UniqueIdentifier>
</Filter>
@@ -558,9 +516,6 @@
<Filter Include="tools">
<UniqueIdentifier>{4515306f-4664-46bf-a89b-abfec5520a15}</UniqueIdentifier>
</Filter>
<Filter Include="thread">
<UniqueIdentifier>{caa41117-1d90-47cc-9fba-f7e670e315a3}</UniqueIdentifier>
</Filter>
<Filter Include="i18n">
<UniqueIdentifier>{02e8ef95-82c7-4420-b029-a189a5e0fcbd}</UniqueIdentifier>
</Filter>
ext/native/net/http_client.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "file/fd_util.h"
#include "net/resolve.h"
#include "net/url.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Buffer.h"
#include "Common/Log.h"
ext/native/net/http_server.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include "file/fd_util.h"
#include "net/http_server.h"
#include "net/sinks.h"
#include "thread/executor.h"
#include "Common/Thread/Executor.h"
#include "Common/Buffer.h"
#include "Common/Log.h"
ext/native/net/http_server.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "net/http_headers.h"
#include "net/resolve.h"
#include "thread/executor.h"
#include "Common/Thread/Executor.h"
namespace net {
class InputSink;
ext/native/thin3d/GLRenderManager.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "GLRenderManager.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"
#include "Common/MemoryUtil.h"
ext/native/thin3d/VulkanRenderManager.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "Common/Vulkan/VulkanContext.h"
#include "thin3d/VulkanRenderManager.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#if 0 // def _DEBUG
#define VLOG(...) INFO_LOG(G3D, __VA_ARGS__)
ext/native/ui/root.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <functional>
#include "ui/ui_context.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
namespace UI {
ext/native/ui/screen.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "base/display.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "ui/root.h"
#include "ui/screen.h"
#include "ui/ui.h"
ext/native/ui/screen.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <mutex>
#include "base/NativeApp.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "Common/Common.h"
ext/native/ui/ui.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <vector>
#include "gfx_es2/draw_buffer.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
class UIContext;
ext/native/ui/ui_screen.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include <sstream>
#include "base/display.h"
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "math/curves.h"
#include "ui/ui_screen.h"
#include "ui/ui_context.h"
ext/native/ui/view.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
#include <algorithm>
#include <mutex>
#include "input/input_state.h"
#include "input/keycodes.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx/texture_atlas.h"
#include "util/text/utf8.h"
ext/native/ui/viewgroup.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <set>
#include <mutex>
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
#include "math/curves.h"
#include "ui/ui_context.h"
#include "ui/ui_tween.h"
ext/native/ui/viewgroup.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <mutex>
#include "math/geom2d.h"
#include "input/gesture_detector.h"
#include "Common/Input/GestureDetector.h"
#include "ui/view.h"
namespace UI {
ios/PPSSPPUIApplication.mm
+2 -2
View File
@@ -15,11 +15,11 @@
#include "base/display.h"
#include "Common/TimeUtil.h"
#include "file/zip_read.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "net/resolve.h"
#include "ui/screen.h"
#include "thin3d/thin3d.h"
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
#include "gfx_es2/gpu_features.h"
#import "ios/AppDelegate.h"
ios/SmartKeyboardMap.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
//
#include "SmartKeyboardMap.hpp"
#include "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
int getSmartKeyboardMap(int keycode) {
switch(keycode) {
ios/ViewController.mm
+2 -2
View File
@@ -15,13 +15,13 @@
#include "base/display.h"
#include "Common/TimeUtil.h"
#include "file/zip_read.h"
#include "input/input_state.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 "input/keycodes.h"
#include "Common/Input/KeyCodes.h"
#include "gfx_es2/gpu_features.h"
#include "Core/Config.h"
libretro/Makefile.common
+6 -5
View File
@@ -144,6 +144,12 @@ SOURCES_CXX += \
SOURCES_CXX += \
$(COMMONDIR)/Serialize/Serializer.cpp \
$(COMMONDIR)/Thread/Executor.cpp \
$(COMMONDIR)/Thread/ThreadUtil.cpp \
$(COMMONDIR)/Thread/ThreadPool.cpp \
$(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \
$(COMMONDIR)/Input/GestureDetector.cpp \
$(COMMONDIR)/Input/InputState.cpp \
$(COMMONDIR)/Buffer.cpp \
$(COMMONDIR)/ConsoleListener.cpp \
$(COMMONDIR)/ExceptionHandlerSetup.cpp \
@@ -295,8 +301,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(NATIVEDIR)/i18n/i18n.cpp \
$(NATIVEDIR)/image/zim_load.cpp \
$(NATIVEDIR)/image/png_load.cpp \
$(NATIVEDIR)/input/gesture_detector.cpp \
$(NATIVEDIR)/input/input_state.cpp \
$(NATIVEDIR)/math/curves.cpp \
$(NATIVEDIR)/math/expression_parser.cpp \
$(NATIVEDIR)/math/lin/matrix4x4.cpp \
@@ -309,9 +313,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(NATIVEDIR)/thin3d/GLRenderManager.cpp \
$(NATIVEDIR)/thin3d/GLQueueRunner.cpp \
$(NATIVEDIR)/thin3d/DataFormatGL.cpp \
$(NATIVEDIR)/thread/threadutil.cpp \
$(NATIVEDIR)/thread/threadpool.cpp \
$(NATIVEDIR)/thread/prioritizedworkqueue.cpp \
$(NATIVEDIR)/ui/root.cpp \
$(NATIVEDIR)/ui/screen.cpp \
$(NATIVEDIR)/ui/ui.cpp \
libretro/libretro.cpp
+2 -2
View File
@@ -27,9 +27,9 @@
#include "GPU/GPUInterface.h"
#include "GPU/Common/FramebufferManagerCommon.h"
#include "GPU/Common/TextureScalerCommon.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "base/NativeApp.h"
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "libretro/libretro.h"
#include "libretro/LibretroGraphicsContext.h"
unittest/UnitTest.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "input/input_state.h"
#include "Common/Input/InputState.h"
#include "ext/disarm.h"
#include "math/math_util.h"
#include "util/text/parsers.h"