mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 04:23:51 +00:00
Code Issues Releases 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
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
5 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
profiler/build/win32/Tracy.vcxproj
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" />

21
profiler/build/win32/Tracy.vcxproj.filters
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" />

15
profiler/src/main.cpp
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 );
}
}

6
server/TracySourceView.cpp
View File

@ -5062,8 +5062,9 @@ void SourceView::Save( const Worker& worker, size_t start, size_t stop )
assert( start < m_asm.size() );
assert( start < stop );
nfdchar_t* fn;
auto res = NFD_SaveDialog( "asm", nullptr, &fn, m_gwcb ? m_gwcb() : nullptr );
nfdu8filteritem_t filter = { "Assembly file", "asm" };
nfdu8char_t* fn;
auto res = NFD_SaveDialogU8( &fn, &filter, 1, nullptr, nullptr );
if( res == NFD_OKAY )
{
FILE* f = nullptr;
@ -5137,6 +5138,7 @@ void SourceView::Save( const Worker& worker, size_t start, size_t stop )
}
fclose( f );
}
NFD_FreePathU8( fn );
}
}
#endif

14
server/TracyView.cpp
View File

@ -1617,8 +1617,9 @@ bool View::DrawConnection()
if( ImGui::Button( ICON_FA_SAVE " Save trace" ) && m_saveThreadState.load( std::memory_order_relaxed ) == SaveThreadState::Inert )
{
#ifndef TRACY_NO_FILESELECTOR
nfdchar_t* fn;
auto res = NFD_SaveDialog( "tracy", nullptr, &fn, m_gwcb ? m_gwcb() : nullptr );
nfdu8filteritem_t filter = { "Tracy Profiler trace file", "tracy" };
nfdu8char_t* fn;
auto res = NFD_SaveDialogU8( &fn, &filter, 1, nullptr, nullptr );
if( res == NFD_OKAY )
#else
const char* fn = "trace.tracy";
@ -1635,6 +1636,9 @@ bool View::DrawConnection()
{
m_filenameStaging = fn;
}
#ifndef TRACY_NO_FILESELECTOR
NFD_FreePathU8( fn );
#endif
}
}
@ -11781,8 +11785,9 @@ void View::DrawCompare()
ImGui::TextWrapped( "Please load a second trace to compare results." );
if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open second trace" ) && !m_compare.loadThread.joinable() )
{
nfdchar_t* fn;
auto res = NFD_OpenDialog( "tracy", nullptr, &fn, m_gwcb ? m_gwcb() : nullptr );
nfdu8filteritem_t filter = { "Tracy Profiler trace file", "tracy" };
nfdu8char_t* fn;
auto res = NFD_OpenDialogU8( &fn, &filter, 1, nullptr );
if( res == NFD_OKAY )
{
try
@ -11813,6 +11818,7 @@ void View::DrawCompare()
m_compare.badVer.state = BadVersionState::ReadError;
}
}
NFD_FreePathU8( fn );
}
tracy::BadVersion( m_compare.badVer, m_bigFont );
ImGui::End();