Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/wolfpld/tracy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Taudul <wolf@nereid.pl>2022-07-25 02:22:41 +0300
committerBartosz Taudul <wolf@nereid.pl>2022-07-28 01:24:43 +0300
commit2d327abd80d5d7e44d8143cc7f613021c52c4da6 (patch)
treec485aa2c7a8ff45fc11b1b729d5e4a5dfc6f8ea4 /profiler
parent054c26781ad7c882ea953f800ca2e11b68153e75 (diff)
Move imgui backends to a subdirectory.
Diffstat (limited to 'profiler')
-rw-r--r--profiler/build/win32/Tracy.vcxproj10
-rw-r--r--profiler/build/win32/Tracy.vcxproj.filters33
-rw-r--r--profiler/src/imgui/imgui_impl_glfw.cpp (renamed from profiler/src/imgui_impl_glfw.cpp)0
-rw-r--r--profiler/src/imgui/imgui_impl_glfw.h (renamed from profiler/src/imgui_impl_glfw.h)0
-rw-r--r--profiler/src/imgui/imgui_impl_opengl3.cpp (renamed from profiler/src/imgui_impl_opengl3.cpp)0
-rw-r--r--profiler/src/imgui/imgui_impl_opengl3.h (renamed from profiler/src/imgui_impl_opengl3.h)0
-rw-r--r--profiler/src/imgui/imgui_impl_opengl3_loader.h (renamed from profiler/src/imgui_impl_opengl3_loader.h)0
-rw-r--r--profiler/src/main.cpp6
8 files changed, 26 insertions, 23 deletions
diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
index 7bf1b086..574567d5 100644
--- a/profiler/build/win32/Tracy.vcxproj
+++ b/profiler/build/win32/Tracy.vcxproj
@@ -196,8 +196,8 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c" />
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c" />
<ClCompile Include="..\..\src\HttpRequest.cpp" />
- <ClCompile Include="..\..\src\imgui_impl_glfw.cpp" />
- <ClCompile Include="..\..\src\imgui_impl_opengl3.cpp" />
+ <ClCompile Include="..\..\src\imgui\imgui_impl_glfw.cpp" />
+ <ClCompile Include="..\..\src\imgui\imgui_impl_opengl3.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\NativeWindow.cpp" />
<ClCompile Include="..\..\src\ResolvService.cpp" />
@@ -316,9 +316,9 @@
<ClInclude Include="..\..\src\font\FontAwesomeSolid.hpp" />
<ClInclude Include="..\..\src\HttpRequest.hpp" />
<ClInclude Include="..\..\src\icon.hpp" />
- <ClInclude Include="..\..\src\imgui_impl_glfw.h" />
- <ClInclude Include="..\..\src\imgui_impl_opengl3.h" />
- <ClInclude Include="..\..\src\imgui_impl_opengl3_loader.h" />
+ <ClInclude Include="..\..\src\imgui\imgui_impl_glfw.h" />
+ <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3.h" />
+ <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3_loader.h" />
<ClInclude Include="..\..\src\NativeWindow.hpp" />
<ClInclude Include="..\..\src\ResolvService.hpp" />
<ClInclude Include="..\..\src\stb_image.h" />
diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters
index 47c0f8df..99039d6f 100644
--- a/profiler/build/win32/Tracy.vcxproj.filters
+++ b/profiler/build/win32/Tracy.vcxproj.filters
@@ -37,6 +37,9 @@
<Filter Include="src\font">
<UniqueIdentifier>{0bd58d14-3948-47ea-b720-47560dd57338}</UniqueIdentifier>
</Filter>
+ <Filter Include="src\imgui">
+ <UniqueIdentifier>{484838ce-9f95-4081-a87f-921ed0c9e7fa}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\server\TracyView.cpp">
@@ -66,12 +69,6 @@
<ClCompile Include="..\..\..\server\TracyStorage.cpp">
<Filter>server</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\imgui_impl_glfw.cpp">
- <Filter>src</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\imgui_impl_opengl3.cpp">
- <Filter>src</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\imgui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
@@ -330,6 +327,12 @@
<ClCompile Include="..\..\..\public\common\TracySystem.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\imgui\imgui_impl_glfw.cpp">
+ <Filter>src\imgui</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\imgui\imgui_impl_opengl3.cpp">
+ <Filter>src\imgui</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\server\TracyEvent.hpp">
@@ -398,12 +401,6 @@
<ClInclude Include="..\..\..\server\TracyStorage.hpp">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\imgui_impl_glfw.h">
- <Filter>src</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\imgui_impl_opengl3.h">
- <Filter>src</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\imgui\imconfig.h">
<Filter>imgui</Filter>
</ClInclude>
@@ -602,9 +599,6 @@
<ClInclude Include="..\..\..\server\TracyWeb.hpp">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\imgui_impl_opengl3_loader.h">
- <Filter>src</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\zstd\common\portability_macros.h">
<Filter>zstd\common</Filter>
</ClInclude>
@@ -674,6 +668,15 @@
<ClInclude Include="..\..\src\font\FontAwesomeSolid.hpp">
<Filter>src\font</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\imgui\imgui_impl_glfw.h">
+ <Filter>src\imgui</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3.h">
+ <Filter>src\imgui</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3_loader.h">
+ <Filter>src\imgui</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
diff --git a/profiler/src/imgui_impl_glfw.cpp b/profiler/src/imgui/imgui_impl_glfw.cpp
index e996fa63..e996fa63 100644
--- a/profiler/src/imgui_impl_glfw.cpp
+++ b/profiler/src/imgui/imgui_impl_glfw.cpp
diff --git a/profiler/src/imgui_impl_glfw.h b/profiler/src/imgui/imgui_impl_glfw.h
index b96f3ee2..b96f3ee2 100644
--- a/profiler/src/imgui_impl_glfw.h
+++ b/profiler/src/imgui/imgui_impl_glfw.h
diff --git a/profiler/src/imgui_impl_opengl3.cpp b/profiler/src/imgui/imgui_impl_opengl3.cpp
index b7587d0e..b7587d0e 100644
--- a/profiler/src/imgui_impl_opengl3.cpp
+++ b/profiler/src/imgui/imgui_impl_opengl3.cpp
diff --git a/profiler/src/imgui_impl_opengl3.h b/profiler/src/imgui/imgui_impl_opengl3.h
index 81722bdf..81722bdf 100644
--- a/profiler/src/imgui_impl_opengl3.h
+++ b/profiler/src/imgui/imgui_impl_opengl3.h
diff --git a/profiler/src/imgui_impl_opengl3_loader.h b/profiler/src/imgui/imgui_impl_opengl3_loader.h
index dfc16562..dfc16562 100644
--- a/profiler/src/imgui_impl_opengl3_loader.h
+++ b/profiler/src/imgui/imgui_impl_opengl3_loader.h
diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp
index 25ee7937..0493986d 100644
--- a/profiler/src/main.cpp
+++ b/profiler/src/main.cpp
@@ -4,9 +4,9 @@
#include <chrono>
#include <inttypes.h>
#include <imgui.h>
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl3.h"
-#include "imgui_impl_opengl3_loader.h"
+#include "imgui/imgui_impl_glfw.h"
+#include "imgui/imgui_impl_opengl3.h"
+#include "imgui/imgui_impl_opengl3_loader.h"
#include <mutex>
#include <stdint.h>
#include <stdio.h>