mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display base frame, not inline frame, if inlines are not shown.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-06 14:17:18 +01:00
parent bb4d390bc7
commit 104415ced8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/TracyView.cpp
View File

@ -3636,7 +3636,7 @@ void DrawZoneTrace( T zone, const std::vector<T>& trace, const Worker& worker, B
for( int8_t j=1; j<idx; j++ ) for( int8_t j=1; j<idx; j++ )
{ {
auto frameData = worker.GetCallstackFrame( prevCs[j] ); auto frameData = worker.GetCallstackFrame( prevCs[j] );
auto frame = frameData->data; auto frame = frameData->data + frameData->size - 1;
ImGui::TextDisabled( "%s", worker.GetString( frame->name ) ); ImGui::TextDisabled( "%s", worker.GetString( frame->name ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
@ -3693,7 +3693,7 @@ void DrawZoneTrace( T zone, const std::vector<T>& trace, const Worker& worker, B
for( uint8_t i=1; i<csz; i++ ) for( uint8_t i=1; i<csz; i++ )
{ {
auto frameData = worker.GetCallstackFrame( cs[i] ); auto frameData = worker.GetCallstackFrame( cs[i] );
auto frame = frameData->data; auto frame = frameData->data + frameData->size - 1;
ImGui::TextDisabled( "%s", worker.GetString( frame->name ) ); ImGui::TextDisabled( "%s", worker.GetString( frame->name ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
@ -5640,7 +5640,8 @@ void View::DrawFindZone()
else else
{ {
auto& callstack = m_worker.GetCallstack( v->first ); auto& callstack = m_worker.GetCallstack( v->first );
hdrString = m_worker.GetString( m_worker.GetCallstackFrame( *callstack.begin() )->data[0].name ); auto& frameData = *m_worker.GetCallstackFrame( *callstack.begin() );
hdrString = m_worker.GetString( frameData.data[frameData.size-1].name );
} }
break; break;
default: default:
@ -8066,12 +8067,13 @@ void View::DrawFrameTreeLevel( std::vector<CallstackFrameTree>& tree, int& idx )
for( auto& v : tree ) for( auto& v : tree )
{ {
idx++; idx++;
auto frame = m_worker.GetCallstackFrame( v.frame )->data; auto& frameData = *m_worker.GetCallstackFrame( v.frame );
auto frame = frameData.data[frameData.size-1];
bool expand = false; bool expand = false;
if( v.children.empty() ) if( v.children.empty() )
{ {
ImGui::Indent( ImGui::GetTreeNodeToLabelSpacing() ); ImGui::Indent( ImGui::GetTreeNodeToLabelSpacing() );
ImGui::Text( "%s", m_worker.GetString( frame->name ) ); ImGui::Text( "%s", m_worker.GetString( frame.name ) );
ImGui::Unindent( ImGui::GetTreeNodeToLabelSpacing() ); ImGui::Unindent( ImGui::GetTreeNodeToLabelSpacing() );
} }
else else
@ -8079,11 +8081,11 @@ void View::DrawFrameTreeLevel( std::vector<CallstackFrameTree>& tree, int& idx )
ImGui::PushID( lidx++ ); ImGui::PushID( lidx++ );
if( tree.size() == 1 ) if( tree.size() == 1 )
{ {
expand = ImGui::TreeNodeEx( m_worker.GetString( frame->name ), ImGuiTreeNodeFlags_DefaultOpen ); expand = ImGui::TreeNodeEx( m_worker.GetString( frame.name ), ImGuiTreeNodeFlags_DefaultOpen );
} }
else else
{ {
expand = ImGui::TreeNode( m_worker.GetString( frame->name ) ); expand = ImGui::TreeNode( m_worker.GetString( frame.name ) );
} }
ImGui::PopID(); ImGui::PopID();
} }
@ -8156,13 +8158,13 @@ void View::DrawFrameTreeLevel( std::vector<CallstackFrameTree>& tree, int& idx )
{ {
ImGui::SameLine(); ImGui::SameLine();
} }
const auto fileName = m_worker.GetString( frame->file ); const auto fileName = m_worker.GetString( frame.file );
ImGui::TextDisabled( "%s:%i", fileName, frame->line ); ImGui::TextDisabled( "%s:%i", fileName, frame.line );
if( ImGui::IsItemClicked( 1 ) ) if( ImGui::IsItemClicked( 1 ) )
{ {
if( FileExists( fileName ) ) if( FileExists( fileName ) )
{ {
SetTextEditorFile( fileName, frame->line ); SetTextEditorFile( fileName, frame.line );
} }
else else
{ {
@ -8615,7 +8617,7 @@ void View::CallstackTooltip( uint32_t idx )
} }
else else
{ {
ImGui::Text( "%s", m_worker.GetString( frame->data->name ) ); ImGui::Text( "%s", m_worker.GetString( frame->data[frame->size-1].name ) );
} }
} }
ImGui::EndTooltip(); ImGui::EndTooltip();