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

Add frame image index to frame data.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-06-06 21:44:48 +02:00
parent e5bb6011c5
commit 34b84bb284
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/TracyEvent.hpp
View File

@ -324,6 +324,7 @@ struct FrameEvent
{ {
int64_t start; int64_t start;
int64_t end; int64_t end;
int32_t frameImage;
}; };
struct FrameData struct FrameData

11
server/TracyWorker.cpp
View File

@ -1729,8 +1729,8 @@ void Worker::Exec()
} }
m_timerMul = welcome.timerMul; m_timerMul = welcome.timerMul;
const auto initEnd = TscTime( welcome.initEnd ); const auto initEnd = TscTime( welcome.initEnd );
m_data.framesBase->frames.push_back( FrameEvent{ TscTime( welcome.initBegin ), -1 } ); m_data.framesBase->frames.push_back( FrameEvent{ TscTime( welcome.initBegin ), -1, -1 } );
m_data.framesBase->frames.push_back( FrameEvent{ initEnd, -1 } ); m_data.framesBase->frames.push_back( FrameEvent{ initEnd, -1, -1 } );
m_data.lastTime = initEnd; m_data.lastTime = initEnd;
m_delay = TscTime( welcome.delay ); m_delay = TscTime( welcome.delay );
m_resolution = TscTime( welcome.resolution ); m_resolution = TscTime( welcome.resolution );
@ -2826,7 +2826,7 @@ void Worker::ProcessFrameMark( const QueueFrameMark& ev )
assert( fd->continuous == 1 ); assert( fd->continuous == 1 );
const auto time = TscTime( ev.time ); const auto time = TscTime( ev.time );
assert( fd->frames.empty() || fd->frames.back().start <= time ); assert( fd->frames.empty() || fd->frames.back().start <= time );
fd->frames.push_back( FrameEvent{ time, -1 } ); fd->frames.push_back( FrameEvent{ time, -1, -1 } );
m_data.lastTime = std::max( m_data.lastTime, time ); m_data.lastTime = std::max( m_data.lastTime, time );
} }
@ -2844,7 +2844,7 @@ void Worker::ProcessFrameMarkStart( const QueueFrameMark& ev )
assert( fd->continuous == 0 ); assert( fd->continuous == 0 );
const auto time = TscTime( ev.time ); const auto time = TscTime( ev.time );
assert( fd->frames.empty() || ( fd->frames.back().end <= time && fd->frames.back().end != -1 ) ); assert( fd->frames.empty() || ( fd->frames.back().end <= time && fd->frames.back().end != -1 ) );
fd->frames.push_back( FrameEvent{ time, -1 } ); fd->frames.push_back( FrameEvent{ time, -1, -1 } );
m_data.lastTime = std::max( m_data.lastTime, time ); m_data.lastTime = std::max( m_data.lastTime, time );
} }
@ -2880,9 +2880,10 @@ void Worker::ProcessFrameImage( const QueueFrameImage& ev )
fi->ptr = (const char*)it->second; fi->ptr = (const char*)it->second;
fi->w = ev.w; fi->w = ev.w;
fi->h = ev.h; fi->h = ev.h;
m_data.frameImage.push_back( fi );
const auto idx = m_data.frameImage.size(); const auto idx = m_data.frameImage.size();
m_data.frameImage.push_back( fi ); m_data.framesBase->frames.back().frameImage = idx;
m_pendingFrameImageData.erase( it ); m_pendingFrameImageData.erase( it );
} }