mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix context switch + samples offset logic.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-11-06 00:20:26 +01:00
parent c9f3898c1b
commit e5967bdc52
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/TracyView.cpp
View File

@ -3004,9 +3004,12 @@ void View::DrawZones()
if( showFull ) if( showFull )
{ {
const auto sampleOffset = offset; const auto sampleOffset = offset;
if( m_vd.drawSamples && !v->samples.empty() ) const auto hasSamples = m_vd.drawSamples && !v->samples.empty();
const auto hasCtxSwitch = m_vd.drawContextSwitches && m_worker.GetContextSwitchData( v->id );
if( hasSamples )
{ {
if( m_vd.drawContextSwitches ) if( hasCtxSwitch )
{ {
offset += round( ostep * 0.5f ); offset += round( ostep * 0.5f );
} }
@ -3017,7 +3020,7 @@ void View::DrawZones()
} }
const auto ctxOffset = offset; const auto ctxOffset = offset;
if( m_vd.drawContextSwitches ) offset += round( ostep * 0.75f ); if( hasCtxSwitch ) offset += round( ostep * 0.75f );
if( m_vd.drawZones ) if( m_vd.drawZones )
{ {
@ -3034,7 +3037,7 @@ void View::DrawZones()
offset += ostep * depth; offset += ostep * depth;
} }
if( m_vd.drawContextSwitches ) if( hasCtxSwitch )
{ {
auto ctxSwitch = m_worker.GetContextSwitchData( v->id ); auto ctxSwitch = m_worker.GetContextSwitchData( v->id );
if( ctxSwitch ) if( ctxSwitch )
@ -3043,7 +3046,7 @@ void View::DrawZones()
} }
} }
if( m_vd.drawSamples && !v->samples.empty() ) if( hasSamples )
{ {
DrawSamples( v->samples, hover, pxns, int64_t( nspx ), wpos, sampleOffset ); DrawSamples( v->samples, hover, pxns, int64_t( nspx ), wpos, sampleOffset );
} }