diff --git a/CMakeLists.txt b/CMakeLists.txt index c1244a96d4..414c9dd149 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -491,6 +491,8 @@ add_library(Common STATIC Common/Math/lin/vec3.h Common/Math/math_util.cpp Common/Math/math_util.h + Common/Profiler/Profiler.cpp + Common/Profiler/Profiler.h Common/Thread/Executor.cpp Common/Thread/Executor.h Common/Thread/PrioritizedWorkQueue.cpp @@ -1059,8 +1061,6 @@ add_library(native STATIC ext/native/net/url.h ext/native/net/websocket_server.cpp ext/native/net/websocket_server.h - ext/native/profiler/profiler.cpp - ext/native/profiler/profiler.h ext/native/thin3d/thin3d.cpp ext/native/thin3d/thin3d.h ext/native/thin3d/thin3d_create.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 99dc270595..6d8e13d2f8 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -393,6 +393,7 @@ + @@ -671,6 +672,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 2a3ba0cc61..1df3526c49 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -226,6 +226,9 @@ Data\Format + + Profiler + @@ -433,6 +436,9 @@ Data\Format + + Profiler + @@ -504,6 +510,9 @@ {b10822cf-4cc0-4bc3-91a9-b20cb66e5cbd} + + {8321632b-8fc5-4a67-adb7-126a328d50eb} + diff --git a/ext/native/profiler/profiler.cpp b/Common/Profiler/Profiler.cpp similarity index 99% rename from ext/native/profiler/profiler.cpp rename to Common/Profiler/Profiler.cpp index 50b36465c5..923a9aed62 100644 --- a/ext/native/profiler/profiler.cpp +++ b/Common/Profiler/Profiler.cpp @@ -5,14 +5,14 @@ #include #include #include +#include -#include +#include "ppsspp_config.h" + +#include "gfx_es2/draw_buffer.h" #include "Common/TimeUtil.h" -#include "gfx_es2/draw_buffer.h" -#include "ppsspp_config.h" -#include "profiler/profiler.h" - +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #define MAX_CATEGORIES 64 // Can be any number, represents max profiled names. diff --git a/ext/native/profiler/profiler.h b/Common/Profiler/Profiler.h similarity index 100% rename from ext/native/profiler/profiler.h rename to Common/Profiler/Profiler.h diff --git a/Core/Core.cpp b/Core/Core.cpp index 73d9ea35a2..e79e08e48d 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -26,7 +26,7 @@ #include "base/display.h" #include "Common/TimeUtil.h" #include "Common/Thread/ThreadUtil.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/GraphicsContext.h" #include "Common/Log.h" diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 81a7b3444d..ca30771568 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -20,7 +20,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeList.h" diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index c77962347d..eb4575fea6 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -20,7 +20,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 390d8f2621..1c82dfa0a6 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -27,7 +27,7 @@ #endif #include "Common/Data/Text/I18n.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 4f1185fffd..bdd93d5179 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -20,7 +20,7 @@ #include #include "Common/Thread/ThreadUtil.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 5205c9d22d..25cb02f392 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -32,7 +32,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Log.h" diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index 90f408b619..ea66611e0f 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/MemMapHelpers.h" diff --git a/Core/MIPS/ARM/ArmCompBranch.cpp b/Core/MIPS/ARM/ArmCompBranch.cpp index b92cca816a..af3fb645f6 100644 --- a/Core/MIPS/ARM/ArmCompBranch.cpp +++ b/Core/MIPS/ARM/ArmCompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index 5a8316f06b..653e1afe4c 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/MIPS/ARM64/Arm64CompBranch.cpp b/Core/MIPS/ARM64/Arm64CompBranch.cpp index 3e84996487..ce7bc2d341 100644 --- a/Core/MIPS/ARM64/Arm64CompBranch.cpp +++ b/Core/MIPS/ARM64/Arm64CompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/ARM64/Arm64Jit.cpp b/Core/MIPS/ARM64/Arm64Jit.cpp index 582cb7191e..cfdb3d0385 100644 --- a/Core/MIPS/ARM64/Arm64Jit.cpp +++ b/Core/MIPS/ARM64/Arm64Jit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(ARM64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/MIPS/IR/IRCompBranch.cpp b/Core/MIPS/IR/IRCompBranch.cpp index df23efa1e1..2592d6227c 100644 --- a/Core/MIPS/IR/IRCompBranch.cpp +++ b/Core/MIPS/IR/IRCompBranch.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index 4324d3ba8f..77d988d139 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -18,7 +18,7 @@ #include #include "ext/xxhash.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/MIPS/MIPS/MipsJit.cpp b/Core/MIPS/MIPS/MipsJit.cpp index 0874282d50..5201437784 100644 --- a/Core/MIPS/MIPS/MipsJit.cpp +++ b/Core/MIPS/MIPS/MipsJit.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(MIPS) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/MIPS/x86/CompBranch.cpp b/Core/MIPS/x86/CompBranch.cpp index b8816d4a12..8c8ce8fd3d 100644 --- a/Core/MIPS/x86/CompBranch.cpp +++ b/Core/MIPS/x86/CompBranch.cpp @@ -18,7 +18,7 @@ #include "ppsspp_config.h" #if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 21e57bf525..97682d5f7d 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -22,7 +22,7 @@ #include #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp index 994475d718..bb554d1c38 100644 --- a/GPU/Common/DrawEngineCommon.cpp +++ b/GPU/Common/DrawEngineCommon.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Core/Config.h" #include "GPU/Common/DrawEngineCommon.h" diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp index 2460af74dc..c4aa0d2c49 100644 --- a/GPU/Common/SplineCommon.cpp +++ b/GPU/Common/SplineCommon.cpp @@ -18,7 +18,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/CPUDetect.h" diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index b00d783338..03e6262940 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -18,7 +18,7 @@ #include #include "ppsspp_config.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Common/MemoryUtil.h" #include "Core/Config.h" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 27db9fd389..8199b3667c 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -40,7 +40,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" #include "Core/MemMapHelpers.h" diff --git a/GPU/Debugger/Playback.cpp b/GPU/Debugger/Playback.cpp index d05b14bc37..4a7fb9ca00 100644 --- a/GPU/Debugger/Playback.cpp +++ b/GPU/Debugger/Playback.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Common.h" #include "Common/Log.h" #include "Core/Core.h" diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 07aae4fadf..1b5be8e793 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -20,7 +20,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/GraphicsContext.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Core/Debugger/Breakpoints.h" #include "Core/MemMapHelpers.h" diff --git a/GPU/Directx9/StateMappingDX9.cpp b/GPU/Directx9/StateMappingDX9.cpp index e37c60eaef..0efeaf996e 100644 --- a/GPU/Directx9/StateMappingDX9.cpp +++ b/GPU/Directx9/StateMappingDX9.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index 438bef2638..759f3541b5 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -26,7 +26,7 @@ #include "Core/CoreTiming.h" #include "gfx/gl_debug_log.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index f2709663cf..ac4faa624a 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/gl_common.h" #include "gfx/gl_debug_log.h" #include "gfx_es2/glsl_program.h" diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 0623af9e33..8fb872cc98 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Data/Text/I18n.h" #include "Common/Log.h" diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 68c7c6a5d1..d1ffc3fecc 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -29,7 +29,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/GLES/StateMappingGLES.cpp b/GPU/GLES/StateMappingGLES.cpp index 73a1805a59..8856bd517f 100644 --- a/GPU/GLES/StateMappingGLES.cpp +++ b/GPU/GLES/StateMappingGLES.cpp @@ -21,7 +21,7 @@ #include "StateMappingGLES.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/gl_debug_log.h" #include "thin3d/GLRenderManager.h" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index d700ff17ff..62844159a7 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -22,7 +22,7 @@ #include "gfx/gl_debug_log.h" #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/GLRenderManager.h" #include "Common/ColorConv.h" diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index da92f820c4..a77a8269ad 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -2,7 +2,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ColorConv.h" #include "Common/GraphicsContext.h" diff --git a/GPU/Software/Clipper.cpp b/GPU/Software/Clipper.cpp index b462bd5977..66db9a08e4 100644 --- a/GPU/Software/Clipper.cpp +++ b/GPU/Software/Clipper.cpp @@ -23,7 +23,7 @@ #include "GPU/Software/Rasterizer.h" #include "GPU/Software/RasterizerRectangle.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" namespace Clipper { diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index 519d5b2e7c..7bfc9b190f 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -18,7 +18,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/ThreadPools.h" #include "Common/ColorConv.h" diff --git a/GPU/Software/RasterizerRectangle.cpp b/GPU/Software/RasterizerRectangle.cpp index be2d042692..668a9476e3 100644 --- a/GPU/Software/RasterizerRectangle.cpp +++ b/GPU/Software/RasterizerRectangle.cpp @@ -3,7 +3,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Core/System.h" diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index d0d49548b9..33de98f955 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -32,7 +32,7 @@ #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "Core/Core.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "GPU/Software/Rasterizer.h" diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 52880e958a..2688698efd 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -18,7 +18,7 @@ #include #include "Common/Data/Convert/SmallDataConvert.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/VulkanRenderManager.h" #include "Common/Log.h" diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index 092f314514..eec77859cb 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -17,7 +17,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "base/display.h" #include "Common/Math/lin/matrix4x4.h" diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 2b9724f127..96e4212ec8 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -18,7 +18,7 @@ #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/FileUtil.h" diff --git a/GPU/Vulkan/PipelineManagerVulkan.cpp b/GPU/Vulkan/PipelineManagerVulkan.cpp index df8446b6bb..23d39bb3bf 100644 --- a/GPU/Vulkan/PipelineManagerVulkan.cpp +++ b/GPU/Vulkan/PipelineManagerVulkan.cpp @@ -3,7 +3,7 @@ #include #include -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Log.h" #include "Common/StringUtils.h" diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index 2c277d7266..f8678a4dd8 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -22,7 +22,7 @@ #include "Common/Math/lin/matrix4x4.h" #include "Common/Math/math_util.h" #include "Common/Data/Convert/SmallDataConvert.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 0ff3400c1f..3e24a899c5 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -22,7 +22,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "thin3d/VulkanRenderManager.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index a577639e2a..0423002a36 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -26,7 +26,7 @@ #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/LogManager.h" #include "Common/CPUDetect.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index aa201f9a13..b848d699bc 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -21,7 +21,7 @@ #include "base/display.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "gfx/texture_atlas.h" #include "gfx_es2/gpu_features.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 2642576e7c..0eb2977cbc 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -55,7 +55,7 @@ #include "Common/Math/fast/fast_math.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "thin3d/thin3d.h" #include "ui/ui.h" #include "ui/screen.h" diff --git a/UI/ProfilerDraw.cpp b/UI/ProfilerDraw.cpp index 8d7cf74021..8b8ce6838e 100644 --- a/UI/ProfilerDraw.cpp +++ b/UI/ProfilerDraw.cpp @@ -21,7 +21,7 @@ #include "gfx_es2/draw_buffer.h" #include "ui/ui_context.h" #include "ui/view.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" static const uint32_t nice_colors[] = { 0xFF8040, diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index de272962bf..9156bfa093 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -419,6 +419,7 @@ + @@ -505,6 +506,7 @@ + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 674947102e..58ec4db297 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -58,6 +58,9 @@ {b23bdba1-6007-4edb-ac75-a04cf8c5e172} + + {6673c122-d7ed-4ccc-969a-12d317ee1f93} + @@ -240,6 +243,9 @@ Data\Format + + Profiler + @@ -428,6 +434,9 @@ Data\Format + + Profiler + diff --git a/Windows/main.cpp b/Windows/main.cpp index 40e4acdc34..5d5464f284 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -36,7 +36,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/Data/Text/I18n.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" #include "net/resolve.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 8654dee504..9ef7d2b702 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -112,7 +112,6 @@ NATIVE_FILES :=\ $(SRC)/ext/native/net/sinks.cpp \ $(SRC)/ext/native/net/url.cpp \ $(SRC)/ext/native/net/websocket_server.cpp \ - $(SRC)/ext/native/profiler/profiler.cpp \ $(SRC)/ext/native/gfx_es2/glsl_program.cpp \ $(SRC)/ext/native/gfx_es2/gpu_features.cpp \ $(SRC)/ext/native/gfx_es2/gl3stub.c \ @@ -278,6 +277,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Math/expression_parser.cpp \ $(SRC)/Common/Math/lin/vec3.cpp.arm \ $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \ + $(SRC)/Common/Profiler/Profiler.cpp \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index b25ff4fdcd..57e2d4c7c6 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -56,7 +56,7 @@ struct JNIEnv {}; #include "Common/File/VFS/AssetReader.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/Math/math_util.h" #include "net/resolve.h" #include "Common/Data/Text/Parsers.h" diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 180060fd62..7a4d64981e 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -412,7 +412,6 @@ - @@ -488,7 +487,6 @@ - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index b3182870ac..e11d74cf0e 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -28,9 +28,6 @@ gfx - - profiler - gfx @@ -177,9 +174,6 @@ gfx - - profiler - gfx @@ -317,9 +311,6 @@ {828bddaf-63e5-4311-985b-bf377f86ff00} - - {c57b41dd-cc33-46ac-b479-19676455ae54} - {49afd06e-eb44-41ac-b038-e109e444a834} diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 0b5ecb7eef..5d88aede92 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -10,7 +10,7 @@ #endif #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" diff --git a/ios/main.mm b/ios/main.mm index 4c9f004c5f..762d4e8ade 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -15,7 +15,7 @@ #import "ViewController.h" #include "base/NativeApp.h" -#include "profiler/profiler.h" +#include "Common/Profiler/Profiler.h" #define CS_OPS_STATUS 0 /* return status */ #define CS_DEBUGGED 0x10000000 /* process is currently or has previously been debugged and allowed to run with invalid pages */