ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nv2a/vk: Make pgraph_vk_insert_debug_marker format strings

This commit is contained in:
Matt Borgerson 2024-08-01 00:52:54 -07:00 committed by mborgerson
parent ca42f0f2df
commit 9ab1f96911
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xbox/nv2a/pgraph/vk/debug.c
View File

@ -59,14 +59,25 @@ void pgraph_vk_debug_frame_terminator(void)
} }
void pgraph_vk_insert_debug_marker(PGRAPHVkState *r, VkCommandBuffer cmd, void pgraph_vk_insert_debug_marker(PGRAPHVkState *r, VkCommandBuffer cmd,
const char *name, float color[4]) float color[4], const char *format, ...)
{ {
if (r->debug_utils_extension_enabled) { if (!r->debug_utils_extension_enabled) {
VkDebugUtilsLabelEXT label_info = { return;
.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
.pLabelName = name,
};
memcpy(label_info.color, color, 4 * sizeof(float));
vkCmdInsertDebugUtilsLabelEXT(cmd, &label_info);
} }
char *buf = NULL;
va_list args;
va_start(args, format);
int err = vasprintf(&buf, format, args);
assert(err >= 0);
va_end(args);
VkDebugUtilsLabelEXT label_info = {
.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
.pLabelName = buf,
};
memcpy(label_info.color, color, 4 * sizeof(float));
vkCmdInsertDebugUtilsLabelEXT(cmd, &label_info);
free(buf);
} }

3
hw/xbox/nv2a/pgraph/vk/renderer.h
View File

@ -392,7 +392,8 @@ void pgraph_vk_check_memory_budget(PGRAPHState *pg);
// debug.c // debug.c
void pgraph_vk_debug_init(void); void pgraph_vk_debug_init(void);
void pgraph_vk_insert_debug_marker(PGRAPHVkState *r, VkCommandBuffer cmd, const char* name, float color[4]); void pgraph_vk_insert_debug_marker(PGRAPHVkState *r, VkCommandBuffer cmd,
float color[4], const char *format, ...) __attribute__ ((format (printf, 4, 5)));
// instance.c // instance.c
void pgraph_vk_init_instance(PGRAPHState *pg, Error **errp); void pgraph_vk_init_instance(PGRAPHState *pg, Error **errp);