From 15382d5f94e7fa957514e6bbce9fc52585b11ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 1 Oct 2020 09:27:25 +0200 Subject: [PATCH 1/2] Move threading utils from native to Common --- CMakeLists.txt | 16 +++++----- Common/Common.vcxproj | 10 ++++++- Common/Common.vcxproj.filters | 29 ++++++++++++++++++- Common/ConsoleListener.cpp | 2 +- Common/ExceptionHandlerSetup.cpp | 5 ++-- .../Thread/Executor.cpp | 2 +- .../executor.h => Common/Thread/Executor.h | 0 .../Thread/PrioritizedWorkQueue.cpp | 2 +- .../Thread/PrioritizedWorkQueue.h | 2 +- .../Thread/ThreadPool.cpp | 4 +-- .../Thread/ThreadPool.h | 0 .../Thread/ThreadUtil.cpp | 3 +- .../Thread/ThreadUtil.h | 0 Common/ThreadPools.h | 2 +- Core/Core.cpp | 2 +- Core/Debugger/WebSocket.cpp | 2 +- Core/Dialog/PSPSaveDialog.cpp | 2 +- Core/FileLoaders/CachingFileLoader.cpp | 2 +- Core/FileLoaders/RamCachingFileLoader.cpp | 2 +- Core/HLE/proAdhoc.cpp | 2 +- Core/HLE/proAdhocServer.cpp | 2 +- Core/HLE/sceIo.cpp | 2 +- Core/HLE/sceNetAdhoc.cpp | 2 +- Core/HLE/sceSas.cpp | 2 +- Core/HW/Camera.h | 2 +- Core/PSPLoaders.cpp | 2 +- Core/Reporting.cpp | 2 +- Core/SaveState.cpp | 2 +- Core/System.cpp | 2 +- Core/Util/PortManager.cpp | 2 +- Core/WebServer.cpp | 2 +- Qt/QtMain.cpp | 2 +- SDL/SDLMain.cpp | 2 +- UI/GameInfoCache.cpp | 2 +- UI/SavedataScreen.cpp | 2 +- UWP/NativeUWP/NativeUWP.vcxproj | 10 +------ UWP/NativeUWP/NativeUWP.vcxproj.filters | 26 +---------------- UWP/PPSSPP_UWPMain.cpp | 2 +- UWP/StorageFileLoader.cpp | 2 +- UWP/StorageFolderBrowser.cpp | 2 +- UWP/XAudioSoundStream.cpp | 2 +- Windows/CaptureDevice.cpp | 2 +- Windows/DSoundStream.cpp | 2 +- Windows/EmuThread.cpp | 2 +- Windows/InputDevice.cpp | 2 +- Windows/MainWindow.cpp | 2 +- Windows/WASAPIStream.cpp | 2 +- Windows/main.cpp | 2 +- android/jni/Android.mk | 4 +++ android/jni/app-android.cpp | 2 +- ext/native/Android.mk | 4 --- ext/native/file/path.cpp | 2 +- ext/native/native.vcxproj | 8 ----- ext/native/native.vcxproj.filters | 27 ----------------- ext/native/net/http_client.cpp | 2 +- ext/native/net/http_server.cpp | 2 +- ext/native/net/http_server.h | 2 +- ext/native/thin3d/GLRenderManager.cpp | 2 +- ext/native/thin3d/VulkanRenderManager.cpp | 2 +- libretro/Makefile.common | 7 +++-- libretro/libretro.cpp | 2 +- 61 files changed, 105 insertions(+), 138 deletions(-) rename ext/native/thread/executor.cpp => Common/Thread/Executor.cpp (91%) rename ext/native/thread/executor.h => Common/Thread/Executor.h (100%) rename ext/native/thread/prioritizedworkqueue.cpp => Common/Thread/PrioritizedWorkQueue.cpp (98%) rename ext/native/thread/prioritizedworkqueue.h => Common/Thread/PrioritizedWorkQueue.h (97%) rename ext/native/thread/threadpool.cpp => Common/Thread/ThreadPool.cpp (97%) rename ext/native/thread/threadpool.h => Common/Thread/ThreadPool.h (100%) rename ext/native/thread/threadutil.cpp => Common/Thread/ThreadUtil.cpp (98%) rename ext/native/thread/threadutil.h => Common/Thread/ThreadUtil.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c323f8885b..568dbb1f51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,6 +433,14 @@ add_library(Common STATIC Common/Crypto/sha1.h Common/Crypto/sha256.cpp Common/Crypto/sha256.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 @@ -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 diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index aceea2b7fc..d631d484a8 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -420,6 +420,10 @@ + + + + @@ -659,6 +663,10 @@ + + + + @@ -681,4 +689,4 @@ - + \ No newline at end of file diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 1322c5858d..a021e84b0c 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -116,6 +116,18 @@ ext\libpng17 + + Thread + + + Thread + + + Thread + + + Thread + @@ -231,6 +243,18 @@ ext\libpng17 + + Thread + + + Thread + + + Thread + + + Thread + @@ -254,10 +278,13 @@ {1d04f87f-73a2-4027-a6ff-e998e92e7d3c} + + {41bcd391-8641-432c-ae4a-ab03812df762} + ext\libpng17 - + \ No newline at end of file diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp index da44073795..ce3cc1f1b7 100644 --- a/Common/ConsoleListener.cpp +++ b/Common/ConsoleListener.cpp @@ -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" diff --git a/Common/ExceptionHandlerSetup.cpp b/Common/ExceptionHandlerSetup.cpp index 0b8f8ac7f0..8232b4ba9e 100644 --- a/Common/ExceptionHandlerSetup.cpp +++ b/Common/ExceptionHandlerSetup.cpp @@ -6,7 +6,6 @@ #include "ppsspp_config.h" -#include "Common/ExceptionHandlerSetup.h" #include #include #include @@ -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; diff --git a/ext/native/thread/executor.cpp b/Common/Thread/Executor.cpp similarity index 91% rename from ext/native/thread/executor.cpp rename to Common/Thread/Executor.cpp index 0ae2b41b64..6f9c689103 100644 --- a/ext/native/thread/executor.cpp +++ b/Common/Thread/Executor.cpp @@ -1,4 +1,4 @@ -#include "thread/executor.h" +#include "Common/Thread/Executor.h" #include #include diff --git a/ext/native/thread/executor.h b/Common/Thread/Executor.h similarity index 100% rename from ext/native/thread/executor.h rename to Common/Thread/Executor.h diff --git a/ext/native/thread/prioritizedworkqueue.cpp b/Common/Thread/PrioritizedWorkQueue.cpp similarity index 98% rename from ext/native/thread/prioritizedworkqueue.cpp rename to Common/Thread/PrioritizedWorkQueue.cpp index 24a51c7c70..d80ad80c41 100644 --- a/ext/native/thread/prioritizedworkqueue.cpp +++ b/Common/Thread/PrioritizedWorkQueue.cpp @@ -2,7 +2,7 @@ #include #include "Common/TimeUtil.h" -#include "thread/prioritizedworkqueue.h" +#include "Common/Thread/PrioritizedWorkQueue.h" #include "Common/Log.h" diff --git a/ext/native/thread/prioritizedworkqueue.h b/Common/Thread/PrioritizedWorkQueue.h similarity index 97% rename from ext/native/thread/prioritizedworkqueue.h rename to Common/Thread/PrioritizedWorkQueue.h index 83848d2c65..59231f48b1 100644 --- a/ext/native/thread/prioritizedworkqueue.h +++ b/Common/Thread/PrioritizedWorkQueue.h @@ -5,7 +5,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Common/Common.h" diff --git a/ext/native/thread/threadpool.cpp b/Common/Thread/ThreadPool.cpp similarity index 97% rename from ext/native/thread/threadpool.cpp rename to Common/Thread/ThreadPool.cpp index 6f5a83d255..e64d1c8786 100644 --- a/ext/native/thread/threadpool.cpp +++ b/Common/Thread/ThreadPool.cpp @@ -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" diff --git a/ext/native/thread/threadpool.h b/Common/Thread/ThreadPool.h similarity index 100% rename from ext/native/thread/threadpool.h rename to Common/Thread/ThreadPool.h diff --git a/ext/native/thread/threadutil.cpp b/Common/Thread/ThreadUtil.cpp similarity index 98% rename from ext/native/thread/threadutil.cpp rename to Common/Thread/ThreadUtil.cpp index 8b9d32bc52..b7c807e61b 100644 --- a/ext/native/thread/threadutil.cpp +++ b/Common/Thread/ThreadUtil.cpp @@ -11,9 +11,8 @@ #include #include -#include "thread/threadutil.h" - #include "Common/Log.h" +#include "Common/Thread/ThreadUtil.h" #if defined(__ANDROID__) || defined(__APPLE__) || (defined(__GLIBC__) && defined(_GNU_SOURCE)) #include diff --git a/ext/native/thread/threadutil.h b/Common/Thread/ThreadUtil.h similarity index 100% rename from ext/native/thread/threadutil.h rename to Common/Thread/ThreadUtil.h diff --git a/Common/ThreadPools.h b/Common/ThreadPools.h index e04303a9d2..350d56da1e 100644 --- a/Common/ThreadPools.h +++ b/Common/ThreadPools.h @@ -1,6 +1,6 @@ #pragma once -#include "thread/threadpool.h" +#include "Common/Thread/ThreadPool.h" class GlobalThreadPool { public: diff --git a/Core/Core.cpp b/Core/Core.cpp index 5e1ad904b1..73d9ea35a2 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -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" diff --git a/Core/Debugger/WebSocket.cpp b/Core/Debugger/WebSocket.cpp index 62d1879cda..418c81188d 100644 --- a/Core/Debugger/WebSocket.cpp +++ b/Core/Debugger/WebSocket.cpp @@ -17,7 +17,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Core/Debugger/WebSocket.h" #include "Core/Debugger/WebSocket/WebSocketUtils.h" #include "Core/MemMap.h" diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 8328ae34f5..637ddfdff4 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -22,7 +22,7 @@ #include #include "i18n/i18n.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Common/FileUtil.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp index 4902af5a33..c4029d01e5 100644 --- a/Core/FileLoaders/CachingFileLoader.cpp +++ b/Core/FileLoaders/CachingFileLoader.cpp @@ -19,7 +19,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Common/TimeUtil.h" #include "Core/FileLoaders/CachingFileLoader.h" diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp index e575b21b72..73e0151b91 100644 --- a/Core/FileLoaders/RamCachingFileLoader.cpp +++ b/Core/FileLoaders/RamCachingFileLoader.cpp @@ -20,7 +20,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Common/TimeUtil.h" #include "Core/FileLoaders/RamCachingFileLoader.h" diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index a93a64656e..4c39013bf5 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -38,7 +38,7 @@ #include #include "i18n/i18n.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "util/text/parsers.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp index 32fea38db0..a345ab0b50 100644 --- a/Core/HLE/proAdhocServer.cpp +++ b/Core/HLE/proAdhocServer.cpp @@ -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" diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 9fd546d131..4f1185fffd 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -19,7 +19,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "profiler/profiler.h" #include "Common/FileUtil.h" diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 0645f4c707..614b9f1d1b 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -29,7 +29,7 @@ #endif #include -#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/ diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 285fee2b37..5205c9d22d 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -33,7 +33,7 @@ #include #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" diff --git a/Core/HW/Camera.h b/Core/HW/Camera.h index 4e36fbd296..c23290915f 100644 --- a/Core/HW/Camera.h +++ b/Core/HW/Camera.h @@ -57,7 +57,7 @@ void __cameraDummyImage(int width, int height, unsigned char** outData, int* out #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" typedef struct { void *start; diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index 53bdc35722..26ad3572ec 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -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" diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 6d6e364834..86d73612ed 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -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 diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index 26c4a6f512..a2ed973231 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -21,7 +21,7 @@ #include #include "i18n/i18n.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "util/text/parsers.h" #include "Common/FileUtil.h" diff --git a/Core/System.cpp b/Core/System.cpp index ebf3eaaaa2..ceaf38c076 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -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" diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp index bc6b18ace2..0e2fb75c28 100644 --- a/Core/Util/PortManager.cpp +++ b/Core/Util/PortManager.cpp @@ -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" diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp index 222ab247de..ce7519a47c 100644 --- a/Core/WebServer.cpp +++ b/Core/WebServer.cpp @@ -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" diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 2ba3a2e630..0010db1920 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -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" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 22a5fa9524..348162d9d3 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -32,7 +32,7 @@ SDLJoystick *joystick = NULL; #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" diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 807448c8ad..08699e24c1 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -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" diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 9714b689a0..bb28391c79 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -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" diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index 54654bc7cc..808814c28c 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -423,10 +423,6 @@ - - - - @@ -599,10 +595,6 @@ - - - - @@ -638,4 +630,4 @@ - \ No newline at end of file + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index 7b5e91cae6..cd0b7803cb 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -55,18 +55,6 @@ thin3d - - thread - - - thread - - - thread - - - thread - util @@ -226,18 +214,6 @@ thin3d - - thread - - - thread - - - thread - - - thread - util @@ -403,4 +379,4 @@ gfx - \ No newline at end of file + diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 4915c4ffa3..8777ced8a7 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -11,7 +11,7 @@ #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" diff --git a/UWP/StorageFileLoader.cpp b/UWP/StorageFileLoader.cpp index dcdbdcff76..2797e9fe2c 100644 --- a/UWP/StorageFileLoader.cpp +++ b/UWP/StorageFileLoader.cpp @@ -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" diff --git a/UWP/StorageFolderBrowser.cpp b/UWP/StorageFolderBrowser.cpp index 3744b3e6dd..4e86ed079f 100644 --- a/UWP/StorageFolderBrowser.cpp +++ b/UWP/StorageFolderBrowser.cpp @@ -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" diff --git a/UWP/XAudioSoundStream.cpp b/UWP/XAudioSoundStream.cpp index 8932b298a0..fa4bc4dd29 100644 --- a/UWP/XAudioSoundStream.cpp +++ b/UWP/XAudioSoundStream.cpp @@ -3,7 +3,7 @@ #include #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "XAudioSoundStream.h" #include diff --git a/Windows/CaptureDevice.cpp b/Windows/CaptureDevice.cpp index a475901137..f697670992 100644 --- a/Windows/CaptureDevice.cpp +++ b/Windows/CaptureDevice.cpp @@ -16,7 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "CaptureDevice.h" #include "BufferLock.h" #include "ext/jpge/jpge.h" diff --git a/Windows/DSoundStream.cpp b/Windows/DSoundStream.cpp index 89111c8067..bd375d025e 100644 --- a/Windows/DSoundStream.cpp +++ b/Windows/DSoundStream.cpp @@ -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" diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index 32af670d4a..80ac516978 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -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, diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp index 70d4a6ff48..57b571bce3 100644 --- a/Windows/InputDevice.cpp +++ b/Windows/InputDevice.cpp @@ -20,7 +20,7 @@ #include #include "input/input_state.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "Core/Config.h" #include "Core/Host.h" #include "Windows/InputDevice.h" diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 14fc10cdf8..fe1d1ee828 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -39,7 +39,7 @@ #include "i18n/i18n.h" #include "input/input_state.h" #include "input/keycodes.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "util/text/utf8.h" #include "Core/Core.h" diff --git a/Windows/WASAPIStream.cpp b/Windows/WASAPIStream.cpp index 17be143334..9e11d558c5 100644 --- a/Windows/WASAPIStream.cpp +++ b/Windows/WASAPIStream.cpp @@ -6,7 +6,7 @@ #include "Core/Reporting.h" #include "Core/Util/AudioFormat.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include #include diff --git a/Windows/main.cpp b/Windows/main.cpp index 2fdfc565d8..04713ef2e9 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -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" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 4e5d42436a..bb51dbe08b 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -233,6 +233,10 @@ 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/Serialize/Serializer.cpp \ $(SRC)/Common/ColorConv.cpp \ $(SRC)/Common/ExceptionHandlerSetup.cpp \ diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 7204b85aed..b665eedee3 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -51,7 +51,7 @@ 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" diff --git a/ext/native/Android.mk b/ext/native/Android.mk index 44fe5405b4..59a328aa0d 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -39,10 +39,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 \ diff --git a/ext/native/file/path.cpp b/ext/native/file/path.cpp index 5be7b326c4..e7be80c609 100644 --- a/ext/native/file/path.cpp +++ b/ext/native/file/path.cpp @@ -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 &files) { http::Client http; diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index a55298b1f6..5395a1ffc2 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -446,10 +446,6 @@ - - - - @@ -562,10 +558,6 @@ - - - - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 059d1df547..f06b11c078 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -119,21 +119,12 @@ util - - thread - - - thread - i18n file - - thread - ui @@ -188,9 +179,6 @@ net - - thread - gfx @@ -361,21 +349,12 @@ util - - thread - - - thread - i18n file - - thread - ui @@ -436,9 +415,6 @@ net - - thread - base @@ -558,9 +534,6 @@ {4515306f-4664-46bf-a89b-abfec5520a15} - - {caa41117-1d90-47cc-9fba-f7e670e315a3} - {02e8ef95-82c7-4420-b029-a189a5e0fcbd} diff --git a/ext/native/net/http_client.cpp b/ext/native/net/http_client.cpp index 24d93ed0c3..f5a80ec17f 100644 --- a/ext/native/net/http_client.cpp +++ b/ext/native/net/http_client.cpp @@ -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" diff --git a/ext/native/net/http_server.cpp b/ext/native/net/http_server.cpp index 738b536f87..5569923cd3 100644 --- a/ext/native/net/http_server.cpp +++ b/ext/native/net/http_server.cpp @@ -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" diff --git a/ext/native/net/http_server.h b/ext/native/net/http_server.h index 5a8151b77d..7102f963b2 100644 --- a/ext/native/net/http_server.h +++ b/ext/native/net/http_server.h @@ -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; diff --git a/ext/native/thin3d/GLRenderManager.cpp b/ext/native/thin3d/GLRenderManager.cpp index bc2e9a9a3c..1aa1d25949 100644 --- a/ext/native/thin3d/GLRenderManager.cpp +++ b/ext/native/thin3d/GLRenderManager.cpp @@ -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" diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index e929b89018..ecd776b2a7 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -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__) diff --git a/libretro/Makefile.common b/libretro/Makefile.common index c6d808017e..dfb91b445c 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -144,6 +144,10 @@ 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)/Buffer.cpp \ $(COMMONDIR)/ConsoleListener.cpp \ $(COMMONDIR)/ExceptionHandlerSetup.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 \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 13f4f2c8a4..6f5ba59245 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -29,7 +29,7 @@ #include "GPU/Common/TextureScalerCommon.h" #include "input/input_state.h" #include "base/NativeApp.h" -#include "thread/threadutil.h" +#include "Common/Thread/ThreadUtil.h" #include "libretro/libretro.h" #include "libretro/LibretroGraphicsContext.h" From 342ed97291eacc4c01626ba11c6b6c3a1cfee3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 1 Oct 2020 09:36:43 +0200 Subject: [PATCH 2/2] Move input utilities from native to Common/Input. --- CMakeLists.txt | 10 ++--- Common/Common.vcxproj | 5 +++ Common/Common.vcxproj.filters | 18 ++++++++ .../Input/GestureDetector.cpp | 2 +- .../Input/GestureDetector.h | 2 +- .../Input/InputState.cpp | 4 +- .../Input/InputState.h | 2 +- .../keycodes.h => Common/Input/KeyCodes.h | 0 Common/KeyMap.cpp | 2 +- Common/KeyMap.h | 4 +- Qt/QtMain.h | 4 +- SDL/SDLJoystick.h | 4 +- SDL/SDLMain.cpp | 4 +- UI/ControlMappingScreen.cpp | 4 +- UI/EmuScreen.cpp | 2 +- UI/EmuScreen.h | 2 +- UI/GamepadEmu.h | 2 +- UI/NativeApp.cpp | 2 +- UWP/App.cpp | 2 +- UWP/CommonUWP/CommonUWP.vcxproj | 13 ++++++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 45 +++++++++++++++++++ UWP/NKCodeFromWindowsSystem.h | 2 +- UWP/NativeUWP/NativeUWP.vcxproj | 5 --- UWP/NativeUWP/NativeUWP.vcxproj.filters | 15 ------- UWP/PPSSPP_UWPMain.cpp | 2 +- UWP/PPSSPP_UWPMain.h | 2 +- UWP/UWPHost.cpp | 2 +- Windows/DinputDevice.cpp | 4 +- Windows/EmuThread.cpp | 2 +- Windows/InputDevice.cpp | 2 +- Windows/MainWindow.cpp | 4 +- Windows/RawInput.cpp | 2 +- Windows/WindowsHost.cpp | 4 +- Windows/XinputDevice.cpp | 4 +- android/jni/Android.mk | 2 + android/jni/app-android.cpp | 4 +- ext/native/Android.mk | 2 - ext/native/base/NativeApp.h | 2 +- ext/native/input/CMakeLists.txt | 13 ------ ext/native/native.vcxproj | 5 --- ext/native/native.vcxproj.filters | 18 -------- ext/native/ui/root.h | 2 +- ext/native/ui/screen.cpp | 2 +- ext/native/ui/screen.h | 2 +- ext/native/ui/ui.h | 2 +- ext/native/ui/ui_screen.cpp | 4 +- ext/native/ui/view.cpp | 4 +- ext/native/ui/viewgroup.cpp | 2 +- ext/native/ui/viewgroup.h | 2 +- ios/PPSSPPUIApplication.mm | 4 +- ios/SmartKeyboardMap.cpp | 2 +- ios/ViewController.mm | 4 +- libretro/Makefile.common | 4 +- libretro/libretro.cpp | 2 +- unittest/UnitTest.cpp | 2 +- 55 files changed, 146 insertions(+), 121 deletions(-) rename ext/native/input/gesture_detector.cpp => Common/Input/GestureDetector.cpp (98%) rename ext/native/input/gesture_detector.h => Common/Input/GestureDetector.h (96%) rename ext/native/input/input_state.cpp => Common/Input/InputState.cpp (96%) rename ext/native/input/input_state.h => Common/Input/InputState.h (99%) rename ext/native/input/keycodes.h => Common/Input/KeyCodes.h (100%) delete mode 100644 ext/native/input/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 568dbb1f51..29d2a45cc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,6 +433,11 @@ 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 @@ -1008,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 diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index d631d484a8..8f64506e1f 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -360,6 +360,9 @@ + + + @@ -611,6 +614,8 @@ false false + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index a021e84b0c..b32b1da778 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -128,6 +128,15 @@ Thread + + Input + + + Input + + + Input + @@ -255,6 +264,12 @@ Thread + + Input + + + Input + @@ -281,6 +296,9 @@ {41bcd391-8641-432c-ae4a-ab03812df762} + + {fd0bac4f-e3e2-4201-8902-2d19b50d5bf7} + diff --git a/ext/native/input/gesture_detector.cpp b/Common/Input/GestureDetector.cpp similarity index 98% rename from ext/native/input/gesture_detector.cpp rename to Common/Input/GestureDetector.cpp index d73f4f9090..cab29e1b1a 100644 --- a/ext/native/input/gesture_detector.cpp +++ b/Common/Input/GestureDetector.cpp @@ -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; diff --git a/ext/native/input/gesture_detector.h b/Common/Input/GestureDetector.h similarity index 96% rename from ext/native/input/gesture_detector.h rename to Common/Input/GestureDetector.h index 783843cee3..908f960769 100644 --- a/ext/native/input/gesture_detector.h +++ b/Common/Input/GestureDetector.h @@ -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. diff --git a/ext/native/input/input_state.cpp b/Common/Input/InputState.cpp similarity index 96% rename from ext/native/input/input_state.cpp rename to Common/Input/InputState.cpp index 8c28473f1d..90fc9b6a1a 100644 --- a/ext/native/input/input_state.cpp +++ b/Common/Input/InputState.cpp @@ -1,5 +1,5 @@ -#include "input/input_state.h" -#include "input/keycodes.h" +#include "Common/Input/InputState.h" +#include "Common/Input/KeyCodes.h" #include const char *GetDeviceName(int deviceId) { diff --git a/ext/native/input/input_state.h b/Common/Input/InputState.h similarity index 99% rename from ext/native/input/input_state.h rename to Common/Input/InputState.h index 2ce502f860..175d6786df 100644 --- a/ext/native/input/input_state.h +++ b/Common/Input/InputState.h @@ -8,7 +8,7 @@ #include #include "math/lin/vec3.h" -#include "input/keycodes.h" +#include "Common/Input/KeyCodes.h" // Default device IDs diff --git a/ext/native/input/keycodes.h b/Common/Input/KeyCodes.h similarity index 100% rename from ext/native/input/keycodes.h rename to Common/Input/KeyCodes.h diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 99d3bf4f05..2a3fb0bb81 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -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" diff --git a/Common/KeyMap.h b/Common/KeyMap.h index 86883a9e98..a0afd74797 100644 --- a/Common/KeyMap.h +++ b/Common/KeyMap.h @@ -21,8 +21,8 @@ #include #include #include -#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 diff --git a/Qt/QtMain.h b/Qt/QtMain.h index 50e0396734..82123fc990 100644 --- a/Qt/QtMain.h +++ b/Qt/QtMain.h @@ -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" diff --git a/SDL/SDLJoystick.h b/SDL/SDLJoystick.h index 970b105199..5b4d67f1ab 100644 --- a/SDL/SDLJoystick.h +++ b/SDL/SDLJoystick.h @@ -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" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 348162d9d3..f0ab1df43a 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -24,8 +24,8 @@ 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" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 1cf93ebb44..07205f10ea 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -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" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index ba3cd45976..48c45e557f 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -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" diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index 9279944c6e..b4504e611c 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -21,7 +21,7 @@ #include #include -#include "input/keycodes.h" +#include "Common/Input/KeyCodes.h" #include "ui/screen.h" #include "ui/ui_screen.h" #include "ui/ui_tween.h" diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h index 57c2c41ecb..fd2fe9c7d3 100644 --- a/UI/GamepadEmu.h +++ b/UI/GamepadEmu.h @@ -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" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 57cfbea75d..dd11226078 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -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" diff --git a/UWP/App.cpp b/UWP/App.cpp index 586d679581..ee26dd40a0 100644 --- a/UWP/App.cpp +++ b/UWP/App.cpp @@ -5,8 +5,8 @@ #include -#include "input/input_state.h" #include "base/NativeApp.h" +#include "Common/Input/InputState.h" #include "Core/System.h" #include "Core/Core.h" diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 3febada63d..c57672cdde 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -386,6 +386,9 @@ + + + @@ -422,6 +425,10 @@ + + + + @@ -442,6 +449,8 @@ + + @@ -466,6 +475,10 @@ + + + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 8df0d99656..1d396b672e 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -10,6 +10,12 @@ {b0ac485c-3153-4708-b098-f5a518a95b79} + + {819c6967-1ed6-4fec-8415-a018ae524180} + + + {7368a8e7-cf29-49e9-87be-f1e69771555e} + @@ -100,6 +106,24 @@ ext\libpng17 + + Input + + + Input + + + Thread + + + Thread + + + Thread + + + Thread + @@ -178,6 +202,27 @@ ext\libpng17 + + Input + + + Input + + + Input + + + Thread + + + Thread + + + Thread + + + Thread + diff --git a/UWP/NKCodeFromWindowsSystem.h b/UWP/NKCodeFromWindowsSystem.h index 470a72456a..94905fb699 100644 --- a/UWP/NKCodeFromWindowsSystem.h +++ b/UWP/NKCodeFromWindowsSystem.h @@ -2,6 +2,6 @@ #include -#include "input/keycodes.h" +#include "Common/Input/KeyCodes.h" extern std::map virtualKeyCodeToNKCode; \ No newline at end of file diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index 808814c28c..d622fc813c 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -402,9 +402,6 @@ - - - @@ -464,8 +461,6 @@ - - diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index cd0b7803cb..66c9bf1ea3 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -94,12 +94,6 @@ file - - input - - - input - ui @@ -268,15 +262,6 @@ file - - input - - - input - - - input - ui diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 8777ced8a7..8ddddcce9a 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -4,7 +4,7 @@ #include #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" diff --git a/UWP/PPSSPP_UWPMain.h b/UWP/PPSSPP_UWPMain.h index 3b38deeb3d..ed720e8a98 100644 --- a/UWP/PPSSPP_UWPMain.h +++ b/UWP/PPSSPP_UWPMain.h @@ -3,7 +3,7 @@ #include #include "thin3d/thin3d.h" -#include "input/input_state.h" +#include "Common/Input/InputState.h" #include "Common/GraphicsContext.h" #include "Common/DeviceResources.h" diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp index b78e8ac055..d7526a9e2c 100644 --- a/UWP/UWPHost.cpp +++ b/UWP/UWPHost.cpp @@ -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" diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index 5d89e4ab54..8d57cd19c5 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -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") diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index 80ac516978..7c3a878435 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -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" diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp index 57b571bce3..28e6c2d379 100644 --- a/Windows/InputDevice.cpp +++ b/Windows/InputDevice.cpp @@ -19,7 +19,7 @@ #include #include -#include "input/input_state.h" +#include "Common/Input/InputState.h" #include "Common/Thread/ThreadUtil.h" #include "Core/Config.h" #include "Core/Host.h" diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index fe1d1ee828..2f3545d5d7 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -37,8 +37,8 @@ #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "i18n/i18n.h" -#include "input/input_state.h" -#include "input/keycodes.h" +#include "Common/Input/InputState.h" +#include "Common/Input/KeyCodes.h" #include "Common/Thread/ThreadUtil.h" #include "util/text/utf8.h" diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp index 861fa393cd..9d7f9ba79a 100644 --- a/Windows/RawInput.cpp +++ b/Windows/RawInput.cpp @@ -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" diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index e34f744f3b..4442fd4d19 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -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" diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index 4693dd6e24..17f8da078d 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -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" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index bb51dbe08b..00b311b8a8 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -237,6 +237,8 @@ EXEC_AND_LIB_FILES := \ $(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 \ diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index b665eedee3..981f1ec979 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -53,8 +53,8 @@ struct JNIEnv {}; #include "base/NativeApp.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" diff --git a/ext/native/Android.mk b/ext/native/Android.mk index 59a328aa0d..7469bb066a 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -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 \ diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h index d109d1138c..3242bfa019 100644 --- a/ext/native/base/NativeApp.h +++ b/ext/native/base/NativeApp.h @@ -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; diff --git a/ext/native/input/CMakeLists.txt b/ext/native/input/CMakeLists.txt deleted file mode 100644 index 266cff4ba7..0000000000 --- a/ext/native/input/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 5395a1ffc2..3bf1ea67e9 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -424,9 +424,6 @@ - - - @@ -531,8 +528,6 @@ - - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index f06b11c078..44381c85cb 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -50,9 +50,6 @@ profiler - - input - file @@ -68,9 +65,6 @@ math - - input - base @@ -182,9 +176,6 @@ gfx - - input - file @@ -301,9 +292,6 @@ gfx - - input - base @@ -373,9 +361,6 @@ math - - input - gfx @@ -507,9 +492,6 @@ {c57b41dd-cc33-46ac-b479-19676455ae54} - - {4ba4474c-b80f-40da-95e8-2de57eb1b327} - {49afd06e-eb44-41ac-b038-e109e444a834} diff --git a/ext/native/ui/root.h b/ext/native/ui/root.h index 0944373e27..052ced4f33 100644 --- a/ext/native/ui/root.h +++ b/ext/native/ui/root.h @@ -3,7 +3,7 @@ #include #include "ui/ui_context.h" -#include "input/input_state.h" +#include "Common/Input/InputState.h" namespace UI { diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp index 696d1986b6..86b1dc02c4 100644 --- a/ext/native/ui/screen.cpp +++ b/ext/native/ui/screen.cpp @@ -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" diff --git a/ext/native/ui/screen.h b/ext/native/ui/screen.h index f0c696a6de..e6a1ae33d1 100644 --- a/ext/native/ui/screen.h +++ b/ext/native/ui/screen.h @@ -17,7 +17,7 @@ #include #include "base/NativeApp.h" -#include "input/input_state.h" +#include "Common/Input/InputState.h" #include "Common/Common.h" diff --git a/ext/native/ui/ui.h b/ext/native/ui/ui.h index f3e2ff327f..3e891a9a28 100644 --- a/ext/native/ui/ui.h +++ b/ext/native/ui/ui.h @@ -27,7 +27,7 @@ #include #include "gfx_es2/draw_buffer.h" -#include "input/input_state.h" +#include "Common/Input/InputState.h" class UIContext; diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp index e46344a41a..7a692f9bc2 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/ext/native/ui/ui_screen.cpp @@ -3,8 +3,8 @@ #include #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" diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp index ce79dfc516..7e261a5c7d 100644 --- a/ext/native/ui/view.cpp +++ b/ext/native/ui/view.cpp @@ -1,8 +1,8 @@ #include #include -#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" diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp index ecec7a1019..2ceae3146a 100644 --- a/ext/native/ui/viewgroup.cpp +++ b/ext/native/ui/viewgroup.cpp @@ -3,7 +3,7 @@ #include #include -#include "input/keycodes.h" +#include "Common/Input/KeyCodes.h" #include "math/curves.h" #include "ui/ui_context.h" #include "ui/ui_tween.h" diff --git a/ext/native/ui/viewgroup.h b/ext/native/ui/viewgroup.h index 0eb3f39328..d61305b2e9 100644 --- a/ext/native/ui/viewgroup.h +++ b/ext/native/ui/viewgroup.h @@ -6,7 +6,7 @@ #include #include "math/geom2d.h" -#include "input/gesture_detector.h" +#include "Common/Input/GestureDetector.h" #include "ui/view.h" namespace UI { diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index c410c8156d..14576fdc95 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -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" diff --git a/ios/SmartKeyboardMap.cpp b/ios/SmartKeyboardMap.cpp index 785e8fafad..43d8e5b46e 100644 --- a/ios/SmartKeyboardMap.cpp +++ b/ios/SmartKeyboardMap.cpp @@ -7,7 +7,7 @@ // #include "SmartKeyboardMap.hpp" -#include "input/keycodes.h" +#include "Common/Input/KeyCodes.h" int getSmartKeyboardMap(int keycode) { switch(keycode) { diff --git a/ios/ViewController.mm b/ios/ViewController.mm index fb86872c7c..769c9d53a5 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -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" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index dfb91b445c..d561afe40e 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -148,6 +148,8 @@ SOURCES_CXX += \ $(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 \ @@ -299,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 \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 6f5ba59245..4e71ad7000 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -27,7 +27,7 @@ #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 "Common/Thread/ThreadUtil.h" diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index 57225020da..74ce2a2dc1 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -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"