Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-14 21:20:26 +01:00
Code Issues Projects Releases Wiki Activity

vk: profiler: draw internal gpu side frame structure

Browse Source
This commit is contained in:
Ivan Avdeev 2023-04-03 11:07:36 -07:00 committed by Ivan Avdeev
parent 1bf6f6ee74
commit 6d43e02dd3
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ref/vk/r_speeds.c
View File

@ -341,7 +341,7 @@ static int drawGraph( r_speeds_graph_t *const graph, int frame_bar_y ) {
return frame_bar_y;
}
static int drawFrames( int draw, uint32_t prev_frame_index, int y, const uint64_t gpu_frame_begin_ns, const uint64_t gpu_frame_end_ns ) {
static int drawFrames( int draw, uint32_t prev_frame_index, int y, const vk_combuf_scopes_t *gpurofl) {
// Draw latest 2 frames; find their boundaries
uint32_t rewind_frame = prev_frame_index;
const int max_frames_to_draw = 2;
@ -373,8 +373,17 @@ static int drawFrames( int draw, uint32_t prev_frame_index, int y, const uint64_
if (draw) {
y += g_speeds.font_metrics.glyph_height * 6;
const int bar_height = g_speeds.font_metrics.glyph_height;
const rgba_t color = {255, 255, 0, 127};
drawTimeBar(frame_begin_time, time_scale_ms, gpu_frame_begin_ns, gpu_frame_end_ns, y, bar_height, "GPU TIME", color);
for (int i = 0; i < gpurofl->entries_count; ++i) {
const int scope_index = gpurofl->entries[i];
const uint64_t begin_ns = gpurofl->timestamps[scope_index*2 + 0];
const uint64_t end_ns = gpurofl->timestamps[scope_index*2 + 1];
const char *name = gpurofl->scopes[scope_index].name;
rgba_t color = {255, 255, 0, 127};
getColorForString(name, color);
drawTimeBar(frame_begin_time, time_scale_ms, begin_ns, end_ns, y + i * bar_height, bar_height, name, color);
}
}
return y;
}
@ -594,7 +603,7 @@ void R_SpeedsDisplayMore(uint32_t prev_frame_index, const struct vk_combuf_scope
{
int y = 100;
const int draw = speeds_bits & SPEEDS_BIT_FRAME;
y = drawFrames( draw, prev_frame_index, y, gpu_frame_begin_ns, gpu_frame_end_ns );
y = drawFrames( draw, prev_frame_index, y, gpurofl );
if (draw)
y = drawGraphs(y + 10);

16
ref/vk/vk_combuf.c
View File

@ -58,7 +58,7 @@ qboolean R_VkCombuf_Init( void ) {
cb->profiler.timestamps_offset = i * MAX_QUERY_COUNT;
}
g_combuf.entire_combuf_scope_id = R_VkGpuScope_Register("EVERYTHING");
g_combuf.entire_combuf_scope_id = R_VkGpuScope_Register("GPU");
return true;
}
@ -66,6 +66,10 @@ qboolean R_VkCombuf_Init( void ) {
void R_VkCombuf_Destroy( void ) {
vkDestroyQueryPool(vk_core.device, g_combuf.timestamp.pool, NULL);
R_VkCommandPoolDestroy(&g_combuf.pool);
for (int i = 0; i < g_combuf.scopes_count; ++i) {
Mem_Free((char*)g_combuf.scopes[i].name);
}
}
vk_combuf_t* R_VkCombufOpen( void ) {
@ -109,13 +113,21 @@ void R_VkCombufEnd( vk_combuf_t* pub ) {
XVK_CHECK(vkEndCommandBuffer(cb->public.cmdbuf));
}
static const char* myStrdup(const char *src) {
const int len = strlen(src);
char *ret = Mem_Malloc(vk_core.pool, len + 1);
memcpy(ret, src, len);
ret[len] = '\0';
return ret;
}
int R_VkGpuScope_Register(const char *name) {
if (g_combuf.scopes_count == MAX_SCOPES) {
gEngine.Con_Printf(S_ERROR "Cannot register GPU profiler scope \"%s\": max number of scope %d reached\n", name, MAX_SCOPES);
return -1;
}
g_combuf.scopes[g_combuf.scopes_count].name = name;
g_combuf.scopes[g_combuf.scopes_count].name = myStrdup(name);
return g_combuf.scopes_count++;
}