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

Explicitly store GPU context type.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-05-27 18:16:53 +02:00
parent 4f3934ae6a
commit 54a029356d
8 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TracyOpenGL.hpp
View File

@ -111,6 +111,7 @@ public:
MemWrite( &item->gpuNewContext.period, period );
MemWrite( &item->gpuNewContext.context, m_context );
MemWrite( &item->gpuNewContext.accuracyBits, (uint8_t)bits );
MemWrite( &item->gpuNewContext.type, GpuContextType::OpenGl );
#ifdef TRACY_ON_DEMAND
GetProfiler().DeferItem( *item );

2
TracyVulkan.hpp
View File

@ -105,6 +105,8 @@ public:
MemWrite( &item->gpuNewContext.period, period );
MemWrite( &item->gpuNewContext.context, m_context );
MemWrite( &item->gpuNewContext.accuracyBits, uint8_t( 0 ) );
MemWrite( &item->gpuNewContext.type, GpuContextType::Vulkan );
#ifdef TRACY_ON_DEMAND
GetProfiler().DeferItem( *item );
#endif

2
common/TracyProtocol.hpp
View File

@ -9,7 +9,7 @@ namespace tracy
constexpr unsigned Lz4CompressBound( unsigned isize ) { return isize + ( isize / 255 ) + 16; }
enum : uint32_t { ProtocolVersion = 32 };
enum : uint32_t { ProtocolVersion = 33 };
enum : uint32_t { BroadcastVersion = 1 };
using lz4sz_t = uint32_t;

9
common/TracyQueue.hpp
View File

@ -258,6 +258,14 @@ struct QueueMessageColor : public QueueMessage
uint8_t b;
};
// Don't change order, only add new entries at the end, this is also used on trace dumps!
enum class GpuContextType : uint8_t
{
Invalid,
OpenGl,
Vulkan
};
struct QueueGpuNewContext
{
int64_t cpuTime;
@ -266,6 +274,7 @@ struct QueueGpuNewContext
float period;
uint8_t context;
uint8_t accuracyBits;
GpuContextType type;
};
struct QueueGpuZoneBegin

2
server/TracyEvent.hpp
View File

@ -12,6 +12,7 @@
#include "TracyVector.hpp"
#include "tracy_robin_hood.h"
#include "../common/TracyForceInline.hpp"
#include "../common/TracyQueue.hpp"
namespace tracy
{
@ -571,6 +572,7 @@ struct GpuCtxData
float period;
unordered_flat_map<uint64_t, GpuCtxThreadData> threadData;
short_ptr<GpuEvent> query[64*1024];
GpuContextType type;
};
enum { GpuCtxDataSize = sizeof( GpuCtxData ) };

2
server/TracyVersion.hpp
View File

@ -7,7 +7,7 @@ namespace Version
{
enum { Major = 0 };
enum { Minor = 6 };
enum { Patch = 13 };
enum { Patch = 14 };
}
}

34
server/TracyView.cpp
View File

@ -54,7 +54,7 @@ namespace tracy
static double s_time = 0;
static const char* s_tracyStackFrames[] = {
constexpr const char* s_tracyStackFrames[] = {
"tracy::Callstack",
"tracy::Callstack(int)",
"tracy::GpuCtxScope::{ctor}",
@ -72,6 +72,12 @@ static const char* s_tracyStackFrames[] = {
nullptr
};
constexpr const char* GpuContextNames[] = {
"Invalid",
"OpenGL",
"Vulkan"
};
static inline uint64_t GetThreadBit( uint8_t thread )
{
@ -2464,16 +2470,10 @@ void View::DrawZones()
{
draw->AddTriangle( wpos + ImVec2( to/2, oldOffset + to/2 ), wpos + ImVec2( to/2, oldOffset + ty - to/2 ), wpos + ImVec2( to/2 + th, oldOffset + ty * 0.5 ), 0xFF886666, 2.0f );
}
const bool isVulkan = v->thread == 0;
const bool isMultithreaded = v->type == GpuContextType::Vulkan;
char buf[64];
if( isVulkan )
{
sprintf( buf, "Vulkan context %zu", i );
}
else
{
sprintf( buf, "OpenGL context %zu", i );
}
sprintf( buf, "%s context %zu", GpuContextNames[(int)v->type], i );
DrawTextContrast( draw, wpos + ImVec2( ty, oldOffset ), showFull ? 0xFFFFAAAA : 0xFF886666, buf );
if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, oldOffset ), wpos + ImVec2( ty + ImGui::CalcTextSize( buf ).x, oldOffset + ty ) ) )
@ -2513,7 +2513,7 @@ void View::DrawZones()
ImGui::BeginTooltip();
ImGui::TextUnformatted( buf );
ImGui::Separator();
if( !isVulkan )
if( !isMultithreaded )
{
SmallColorBox( GetThreadColor( v->thread, 0 ) );
ImGui::SameLine();
@ -2590,7 +2590,7 @@ void View::DrawZones()
}
TextFocused( "Zone count:", RealToString( v->count ) );
//TextFocused( "Top-level zones:", RealToString( v->timeline.size() ) );
if( isVulkan )
if( isMultithreaded )
{
TextFocused( "Timestamp accuracy:", TimeToString( v->period ) );
}
@ -7878,16 +7878,8 @@ void View::DrawOptions()
for( size_t i=0; i<gpuData.size(); i++ )
{
const auto& timeline = gpuData[i]->threadData.begin()->second.timeline;
const bool isVulkan = gpuData[i]->thread == 0;
char buf[1024];
if( isVulkan )
{
sprintf( buf, "Vulkan context %zu", i );
}
else
{
sprintf( buf, "OpenGL context %zu", i );
}
sprintf( buf, "%s context %zu", GpuContextNames[(int)gpuData[i]->type], i );
SmallCheckbox( buf, &Vis( gpuData[i] ).visible );
ImGui::SameLine();
if( gpuData[i]->threadData.size() == 1 )

13
server/TracyWorker.cpp
View File

@ -1082,7 +1082,15 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
for( uint64_t i=0; i<sz; i++ )
{
auto ctx = m_slab.AllocInit<GpuCtxData>();
f.Read4( ctx->thread, ctx->accuracyBits, ctx->count, ctx->period );
if( fileVer >= FileVersion( 0, 6, 14 ) )
{
f.Read5( ctx->thread, ctx->accuracyBits, ctx->count, ctx->period, ctx->type );
}
else
{
f.Read4( ctx->thread, ctx->accuracyBits, ctx->count, ctx->period );
ctx->type = ctx->thread == 0 ? GpuContextType::Vulkan : GpuContextType::OpenGl;
}
m_data.gpuCnt += ctx->count;
if( fileVer >= FileVersion( 0, 5, 10 ) )
{
@ -5163,6 +5171,7 @@ void Worker::ProcessMessageAppInfo( const QueueMessage& ev )
void Worker::ProcessGpuNewContext( const QueueGpuNewContext& ev )
{
assert( !m_gpuCtxMap[ev.context] );
assert( ev.type != GpuContextType::Invalid );
int64_t gpuTime;
if( ev.period == 1.f )
@ -5181,6 +5190,7 @@ void Worker::ProcessGpuNewContext( const QueueGpuNewContext& ev )
gpu->accuracyBits = ev.accuracyBits;
gpu->period = ev.period;
gpu->count = 0;
gpu->type = ev.type;
m_data.gpuData.push_back( gpu );
m_gpuCtxMap[ev.context] = gpu;
}
@ -7081,6 +7091,7 @@ void Worker::Write( FileWrite& f )
f.Write( &ctx->accuracyBits, sizeof( ctx->accuracyBits ) );
f.Write( &ctx->count, sizeof( ctx->count ) );
f.Write( &ctx->period, sizeof( ctx->period ) );
f.Write( &ctx->type, sizeof( ctx->type ) );
sz = ctx->threadData.size();
f.Write( &sz, sizeof( sz ) );
for( auto& td : ctx->threadData )