Move the profiler to Common

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

Common/Common.vcxproj

@@ -393,6 +393,7 @@
     <ClInclude Include="Math\lin\matrix4x4.h" />
     <ClInclude Include="Math\lin\vec3.h" />
     <ClInclude Include="Math\math_util.h" />
+    <ClInclude Include="Profiler\Profiler.h" />
     <ClInclude Include="Serialize\SerializeDeque.h" />
     <ClInclude Include="Serialize\SerializeFuncs.h" />
     <ClInclude Include="ColorConvNEON.h" />
@@ -671,6 +672,7 @@
     <ClCompile Include="Math\lin\matrix4x4.cpp" />
     <ClCompile Include="Math\lin\vec3.cpp" />
     <ClCompile Include="Math\math_util.cpp" />
+    <ClCompile Include="Profiler\Profiler.cpp" />
     <ClCompile Include="Serialize\Serializer.cpp" />
     <ClCompile Include="ColorConv.cpp" />
     <ClCompile Include="ConsoleListener.cpp" />

Common/Common.vcxproj.filters

@@ -226,6 +226,9 @@
     <ClInclude Include="Data\Format\JSONWriter.h">
       <Filter>Data\Format</Filter>
     </ClInclude>
+    <ClInclude Include="Profiler\Profiler.h">
+      <Filter>Profiler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -433,6 +436,9 @@
     <ClCompile Include="Data\Format\JSONWriter.cpp">
       <Filter>Data\Format</Filter>
     </ClCompile>
+    <ClCompile Include="Profiler\Profiler.cpp">
+      <Filter>Profiler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -504,6 +510,9 @@
     <Filter Include="File\VFS">
       <UniqueIdentifier>{b10822cf-4cc0-4bc3-91a9-b20cb66e5cbd}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Profiler">
+      <UniqueIdentifier>{8321632b-8fc5-4a67-adb7-126a328d50eb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">

Common/Profiler/Profiler.cpp

@@ -5,14 +5,14 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <cstring>
 
-#include <string.h>
+#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.

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"

Core/CoreTiming.cpp

@@ -20,7 +20,7 @@
 #include <cstdio>
 #include <mutex>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeList.h"

Core/HLE/HLE.cpp

@@ -20,7 +20,7 @@
 #include <vector>
 #include <string>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Log.h"
 #include "Common/Serialize/SerializeFuncs.h"

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"

Core/HLE/sceIo.cpp

@@ -20,7 +20,7 @@
 #include <thread>
 
 #include "Common/Thread/ThreadUtil.h"
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/FileUtil.h"
 #include "Common/Serialize/SerializeFuncs.h"

Core/HLE/sceSas.cpp

@@ -32,7 +32,7 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Log.h"

Core/HW/SasAudio.cpp

@@ -17,7 +17,7 @@
 
 #include <algorithm>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/MemMapHelpers.h"

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"

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"

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"

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"

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"

Core/MIPS/IR/IRJit.cpp

@@ -18,7 +18,7 @@
 #include <set>
 
 #include "ext/xxhash.h"
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Log.h"
 #include "Common/Serialize/Serializer.h"

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"

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"

Core/MIPS/x86/Jit.cpp

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

GPU/Common/DrawEngineCommon.cpp

@@ -17,7 +17,7 @@
 
 #include <algorithm>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 #include "Common/ColorConv.h"
 #include "Core/Config.h"
 #include "GPU/Common/DrawEngineCommon.h"

GPU/Common/SplineCommon.cpp

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <algorithm>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/CPUDetect.h"
 

GPU/Common/TextureCacheCommon.cpp

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

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"

GPU/Debugger/Playback.cpp

@@ -21,7 +21,7 @@
 #include <mutex>
 #include <vector>
 #include <snappy-c.h>
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 #include "Common/Common.h"
 #include "Common/Log.h"
 #include "Core/Core.h"

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"

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"

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"

GPU/GLES/FramebufferManagerGLES.cpp

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

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"

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"
 

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"
 

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"

GPU/GPUCommon.cpp

@@ -2,7 +2,7 @@
 #include <type_traits>
 #include <mutex>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/ColorConv.h"
 #include "Common/GraphicsContext.h"

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 {
 

GPU/Software/Rasterizer.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/ThreadPools.h"
 #include "Common/ColorConv.h"

GPU/Software/RasterizerRectangle.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Core/System.h"
 

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"

GPU/Vulkan/DrawEngineVulkan.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 
 #include "Common/Data/Convert/SmallDataConvert.h"
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 #include "thin3d/VulkanRenderManager.h"
 
 #include "Common/Log.h"

GPU/Vulkan/FramebufferManagerVulkan.cpp

@@ -17,7 +17,7 @@
 
 #include <algorithm>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "base/display.h"
 #include "Common/Math/lin/matrix4x4.h"

GPU/Vulkan/GPU_Vulkan.cpp

@@ -18,7 +18,7 @@
 
 #include <thread>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Log.h"
 #include "Common/FileUtil.h"

GPU/Vulkan/PipelineManagerVulkan.cpp

@@ -3,7 +3,7 @@
 #include <set>
 #include <sstream>
 
-#include "profiler/profiler.h"
+#include "Common/Profiler/Profiler.h"
 
 #include "Common/Log.h"
 #include "Common/StringUtils.h"

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"
 

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"
 

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"

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"

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"

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,

UWP/CommonUWP/CommonUWP.vcxproj

@@ -419,6 +419,7 @@
     <ClInclude Include="..\..\Common\Math\lin\matrix4x4.h" />
     <ClInclude Include="..\..\Common\Math\lin\vec3.h" />
     <ClInclude Include="..\..\Common\Math\math_util.h" />
+    <ClInclude Include="..\..\Common\Profiler\Profiler.h" />
     <ClInclude Include="..\..\Common\Serialize\Serializer.h" />
     <ClInclude Include="..\..\Common\Serialize\SerializeDeque.h" />
     <ClInclude Include="..\..\Common\Serialize\SerializeFuncs.h" />
@@ -505,6 +506,7 @@
     <ClCompile Include="..\..\Common\Math\lin\matrix4x4.cpp" />
     <ClCompile Include="..\..\Common\Math\lin\vec3.cpp" />
     <ClCompile Include="..\..\Common\Math\math_util.cpp" />
+    <ClCompile Include="..\..\Common\Profiler\Profiler.cpp" />
     <ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
     <ClCompile Include="..\..\Common\ColorConv.cpp" />
     <ClCompile Include="..\..\Common\ColorConvNEON.cpp" />

UWP/CommonUWP/CommonUWP.vcxproj.filters

@@ -58,6 +58,9 @@
     <Filter Include="File\VFS">
       <UniqueIdentifier>{b23bdba1-6007-4edb-ac75-a04cf8c5e172}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Profiler">
+      <UniqueIdentifier>{6673c122-d7ed-4ccc-969a-12d317ee1f93}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Common\ABI.cpp" />
@@ -240,6 +243,9 @@
     <ClCompile Include="..\..\Common\Data\Format\JSONWriter.cpp">
       <Filter>Data\Format</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\Profiler\Profiler.cpp">
+      <Filter>Profiler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -428,6 +434,9 @@
     <ClInclude Include="..\..\Common\Data\Format\JSONWriter.h">
       <Filter>Data\Format</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\Profiler\Profiler.h">
+      <Filter>Profiler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\ext\libpng17\CMakeLists.txt">

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"

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 \

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"

ext/native/native.vcxproj

@@ -412,7 +412,6 @@
     <ClInclude Include="net\http_server.h" />
     <ClInclude Include="net\resolve.h" />
     <ClInclude Include="net\url.h" />
-    <ClInclude Include="profiler\profiler.h" />
     <ClInclude Include="net\sinks.h" />
     <ClInclude Include="thin3d\d3dx9_loader.h" />
     <ClInclude Include="thin3d\thin3d.h" />
@@ -488,7 +487,6 @@
     <ClCompile Include="net\http_server.cpp" />
     <ClCompile Include="net\resolve.cpp" />
     <ClCompile Include="net\url.cpp" />
-    <ClCompile Include="profiler\profiler.cpp" />
     <ClCompile Include="net\sinks.cpp" />
     <ClCompile Include="thin3d\d3dx9_loader.cpp" />
     <ClCompile Include="thin3d\thin3d.cpp" />

ext/native/native.vcxproj.filters

@@ -28,9 +28,6 @@
     <ClInclude Include="gfx_es2\glsl_program.h">
       <Filter>gfx</Filter>
     </ClInclude>
-    <ClInclude Include="profiler\profiler.h">
-      <Filter>profiler</Filter>
-    </ClInclude>
     <ClInclude Include="gfx\texture_atlas.h">
       <Filter>gfx</Filter>
     </ClInclude>
@@ -177,9 +174,6 @@
     <ClCompile Include="gfx_es2\glsl_program.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
-    <ClCompile Include="profiler\profiler.cpp">
-      <Filter>profiler</Filter>
-    </ClCompile>
     <ClCompile Include="gfx\texture_atlas.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
@@ -317,9 +311,6 @@
     <Filter Include="image">
       <UniqueIdentifier>{828bddaf-63e5-4311-985b-bf377f86ff00}</UniqueIdentifier>
     </Filter>
-    <Filter Include="profiler">
-      <UniqueIdentifier>{c57b41dd-cc33-46ac-b479-19676455ae54}</UniqueIdentifier>
-    </Filter>
     <Filter Include="file">
       <UniqueIdentifier>{49afd06e-eb44-41ac-b038-e109e444a834}</UniqueIdentifier>
     </Filter>

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"

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 */