zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Adapt code to new NFD.

Browse Source
This commit is contained in:
Bartosz Taudul
2022-04-20 18:24:00 +02:00
parent 70a8da90ad
commit a852cf390a
5 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/build/win32/Tracy.vcxproj
-3
View File
@@ -114,7 +114,6 @@
<ClCompile Include="..\..\..\imgui\imgui_tables.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\..\..\imgui\misc\freetype\imgui_freetype.cpp" />
<ClCompile Include="..\..\..\nfd\nfd_common.c" />
<ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp" />
<ClCompile Include="..\..\..\server\TracyColor.cpp" />
@@ -196,9 +195,7 @@
<ClInclude Include="..\..\..\imgui\imstb_textedit.h" />
<ClInclude Include="..\..\..\imgui\imstb_truetype.h" />
<ClInclude Include="..\..\..\imgui\misc\freetype\imgui_freetype.h" />
<ClInclude Include="..\..\..\nfd\common.h" />
<ClInclude Include="..\..\..\nfd\nfd.h" />
<ClInclude Include="..\..\..\nfd\nfd_common.h" />
<ClInclude Include="..\..\..\server\IconsFontAwesome5.h" />
<ClInclude Include="..\..\..\server\TracyBadVersion.hpp" />
<ClInclude Include="..\..\..\server\TracyBuzzAnim.hpp" />
profiler/build/win32/Tracy.vcxproj.filters
+6 -15
View File
@@ -60,12 +60,6 @@
<ClCompile Include="..\..\..\server\TracyMemory.cpp">
<Filter>server</Filter>
</ClCompile>
<ClCompile Include="..\..\..\nfd\nfd_common.c">
<Filter>nfd</Filter>
</ClCompile>
<ClCompile Include="..\..\..\nfd\nfd_win.cpp">
<Filter>nfd</Filter>
</ClCompile>
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp">
<Filter>server</Filter>
</ClCompile>
@@ -246,6 +240,9 @@
<ClCompile Include="..\..\..\server\TracyWeb.cpp">
<Filter>server</Filter>
</ClCompile>
<ClCompile Include="..\..\..\nfd\nfd_win.cpp">
<Filter>nfd</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -281,15 +278,6 @@
<ClInclude Include="..\..\..\server\TracyMemory.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\nfd\common.h">
<Filter>nfd</Filter>
</ClInclude>
<ClInclude Include="..\..\..\nfd\nfd.h">
<Filter>nfd</Filter>
</ClInclude>
<ClInclude Include="..\..\..\nfd\nfd_common.h">
<Filter>nfd</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracyFileRead.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -584,6 +572,9 @@
<ClInclude Include="..\..\..\zstd\compress\clevels.h">
<Filter>zstd\compress</Filter>
</ClInclude>
<ClInclude Include="..\..\..\nfd\nfd.h">
<Filter>nfd</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
profiler/src/main.cpp
+13 -2
View File
@@ -393,6 +393,10 @@ int main( int argc, char** argv )
view = std::make_unique<tracy::View>( RunOnMainThread, connectTo, port, fixedWidth, smallFont, bigFont, SetWindowTitleCallback, GetMainWindowNative, SetupScaleCallback );
}
#ifndef TRACY_NO_FILESELECTOR
NFD_Init();
#endif
glfwShowWindow( window );
// Main loop
@@ -450,6 +454,11 @@ int main( int argc, char** argv )
ImGui::DestroyContext();
glfwDestroyWindow(window);
#ifndef TRACY_NO_FILESELECTOR
NFD_Quit();
#endif
glfwTerminate();
{
@@ -773,8 +782,9 @@ static void DrawContents()
#ifndef TRACY_NO_FILESELECTOR
if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open saved trace" ) && !loadThread.joinable() )
{
nfdchar_t* fn;
auto res = NFD_OpenDialog( "tracy", nullptr, &fn, GetMainWindowNative() );
nfdu8filteritem_t filter = { "Tracy Profiler trace file", "tracy" };
nfdu8char_t* fn;
auto res = NFD_OpenDialogU8( &fn, &filter, 1, nullptr );
if( res == NFD_OKAY )
{
try
@@ -808,6 +818,7 @@ static void DrawContents()
{
badVer.state = tracy::BadVersionState::ReadError;
}
NFD_FreePathU8( fn );
}
}