thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move threading utils from native to Common

Browse source
This commit is contained in:
Henrik Rydgård 2020-10-01 09:27:25 +02:00
parent ef08c0237f
commit 15382d5f94
61 changed files with 105 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

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

8
Common/Common.vcxproj
View file

@ -420,6 +420,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" />
@ -659,6 +663,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" />

27
Common/Common.vcxproj.filters
View file

@ -116,6 +116,18 @@
<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>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -231,6 +243,18 @@
<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>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@ -254,6 +278,9 @@
<Filter Include="ext\libpng17">
<UniqueIdentifier>{1d04f87f-73a2-4027-a6ff-e998e92e7d3c}</UniqueIdentifier>
</Filter>
<Filter Include="Thread">
<UniqueIdentifier>{41bcd391-8641-432c-ae4a-ab03812df762}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">

2
Common/ConsoleListener.cpp
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"

5
Common/ExceptionHandlerSetup.cpp
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;

2
ext/native/thread/executor.cpp → Common/Thread/Executor.cpp
View file

@ -1,4 +1,4 @@
#include "thread/executor.h"
#include "Common/Thread/Executor.h"
#include <functional>
#include <thread>

0
ext/native/thread/executor.h → Common/Thread/Executor.h
View file

2
ext/native/thread/prioritizedworkqueue.cpp → Common/Thread/PrioritizedWorkQueue.cpp
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"

2
ext/native/thread/prioritizedworkqueue.h → Common/Thread/PrioritizedWorkQueue.h
View file

@ -5,7 +5,7 @@
#include <mutex>
#include <condition_variable>
#include "thread/threadutil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Common.h"

4
ext/native/thread/threadpool.cpp → Common/Thread/ThreadPool.cpp
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"

0
ext/native/thread/threadpool.h → Common/Thread/ThreadPool.h
View file

3
ext/native/thread/threadutil.cpp → Common/Thread/ThreadUtil.cpp
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>

0
ext/native/thread/threadutil.h → Common/Thread/ThreadUtil.h
View file

2
Common/ThreadPools.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "thread/threadpool.h"
#include "Common/Thread/ThreadPool.h"
class GlobalThreadPool {
public:

2
Core/Core.cpp
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"

2
Core/Debugger/WebSocket.cpp
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"

2
Core/Dialog/PSPSaveDialog.cpp
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"

2
Core/FileLoaders/CachingFileLoader.cpp
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"

2
Core/FileLoaders/RamCachingFileLoader.cpp
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"

2
Core/HLE/proAdhoc.cpp
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"

2
Core/HLE/proAdhocServer.cpp
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"

2
Core/HLE/sceIo.cpp
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"

2
Core/HLE/sceNetAdhoc.cpp
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/

2
Core/HLE/sceSas.cpp
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"

2
Core/HW/Camera.h
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;

2
Core/PSPLoaders.cpp
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"

2
Core/Reporting.cpp
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

2
Core/SaveState.cpp
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"

2
Core/System.cpp
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"

2
Core/Util/PortManager.cpp
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"

2
Core/WebServer.cpp
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"

2
Qt/QtMain.cpp
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"

2
SDL/SDLMain.cpp
View file

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

2
UI/GameInfoCache.cpp
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"

2
UI/SavedataScreen.cpp
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"

8
UWP/NativeUWP/NativeUWP.vcxproj
View file

@ -423,10 +423,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" />
@ -599,10 +595,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" />

24
UWP/NativeUWP/NativeUWP.vcxproj.filters
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>
@ -226,18 +214,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>

2
UWP/PPSSPP_UWPMain.cpp
View file

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

2
UWP/StorageFileLoader.cpp
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"

2
UWP/StorageFolderBrowser.cpp
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"

2
UWP/XAudioSoundStream.cpp
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>

2
Windows/CaptureDevice.cpp
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"

2
Windows/DSoundStream.cpp
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"

2
Windows/EmuThread.cpp
View file

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

2
Windows/InputDevice.cpp
View file

@ -20,7 +20,7 @@
#include <atomic>
#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"

2
Windows/MainWindow.cpp
View file

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

2
Windows/WASAPIStream.cpp
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>

2
Windows/main.cpp
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"

4
android/jni/Android.mk
View file

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

2
android/jni/app-android.cpp
View file

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

4
ext/native/Android.mk
View file

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

2
ext/native/file/path.cpp
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;

8
ext/native/native.vcxproj
View file

@ -446,10 +446,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" />
@ -562,10 +558,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" />

27
ext/native/native.vcxproj.filters
View file

@ -119,21 +119,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,9 +179,6 @@
<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>
@ -361,21 +349,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>
@ -436,9 +415,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>
@ -558,9 +534,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>

2
ext/native/net/http_client.cpp
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"

2
ext/native/net/http_server.cpp
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"

2
ext/native/net/http_server.h
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;

2
ext/native/thin3d/GLRenderManager.cpp
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"

2
ext/native/thin3d/VulkanRenderManager.cpp
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__)

7
libretro/Makefile.common
View file

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

2
libretro/libretro.cpp
View file

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