mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only retrieve frame offset internally in GetFrameNumber().

Browse Source
This commit is contained in:
Bartosz Taudul 2023-03-04 00:32:15 +01:00
parent 8164b776fd
commit f9449bc938
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyView.hpp
View File

@ -316,7 +316,7 @@ private:
const GpuCtxData* GetZoneCtx( const GpuEvent& zone ) const; const GpuCtxData* GetZoneCtx( const GpuEvent& zone ) const;
bool FindMatchingZone( int prev0, int prev1, int flags ); bool FindMatchingZone( int prev0, int prev1, int flags );
const ZoneEvent* FindZoneAtTime( uint64_t thread, int64_t time ) const; const ZoneEvent* FindZoneAtTime( uint64_t thread, int64_t time ) const;
uint64_t GetFrameNumber( const FrameData& fd, int i, uint64_t offset ) const; uint64_t GetFrameNumber( const FrameData& fd, int i ) const;
const char* GetFrameText( const FrameData& fd, int i, uint64_t ftime ) const; const char* GetFrameText( const FrameData& fd, int i, uint64_t ftime ) const;
const char* GetFrameSetName( const FrameData& fd ) const; const char* GetFrameSetName( const FrameData& fd ) const;
static const char* GetFrameSetName( const FrameData& fd, const Worker& worker ); static const char* GetFrameSetName( const FrameData& fd, const Worker& worker );

2
server/TracyView_FrameOverview.cpp
View File

@ -141,7 +141,7 @@ void View::DrawFrames()
} }
else else
{ {
const auto fnum = GetFrameNumber( *m_frames, sel, m_worker.GetFrameOffset() ); const auto fnum = GetFrameNumber( *m_frames, sel );
m_frameHover = sel; m_frameHover = sel;
if( m_frames->name == 0 ) if( m_frames->name == 0 )
{ {

2
server/TracyView_Playback.cpp
View File

@ -194,7 +194,7 @@ void View::DrawPlayback()
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
TextFocused( "Frame:", RealToString( GetFrameNumber( *frameSet, fi->frameRef, m_worker.GetFrameOffset() ) ) ); TextFocused( "Frame:", RealToString( GetFrameNumber( *frameSet, fi->frameRef ) ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();

5
server/TracyView_Utility.cpp
View File

@ -749,10 +749,11 @@ int64_t View::AdjustGpuTime( int64_t time, int64_t begin, int drift )
return time + t / 1000000000 * drift; return time + t / 1000000000 * drift;
} }
uint64_t View::GetFrameNumber( const FrameData& fd, int i, uint64_t offset ) const uint64_t View::GetFrameNumber( const FrameData& fd, int i ) const
{ {
if( fd.name == 0 ) if( fd.name == 0 )
{ {
const auto offset = m_worker.GetFrameOffset();
if( offset == 0 ) if( offset == 0 )
{ {
return i; return i;
@ -770,7 +771,7 @@ uint64_t View::GetFrameNumber( const FrameData& fd, int i, uint64_t offset ) con
const char* View::GetFrameText( const FrameData& fd, int i, uint64_t ftime ) const const char* View::GetFrameText( const FrameData& fd, int i, uint64_t ftime ) const
{ {
const auto fnum = GetFrameNumber( fd, i, m_worker.GetFrameOffset() ); const auto fnum = GetFrameNumber( fd, i );
static char buf[1024]; static char buf[1024];
if( fd.name == 0 ) if( fd.name == 0 )
{ {