hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added QueueBegin/End/Insert at DebugUtils

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2022-09-26 22:06:17 +08:00
parent a0a5ab5da4
commit 28e48a0142
3 changed files with 71 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inc/hgl/graph/VKDebugUtils.h
View File

@ -7,9 +7,16 @@
VK_NAMESPACE_BEGIN
struct DebugUtilsFunction
{
PFN_vkSetDebugUtilsObjectNameEXT SetName;
PFN_vkCmdBeginDebugUtilsLabelEXT Begin;
PFN_vkCmdEndDebugUtilsLabelEXT End;
PFN_vkSetDebugUtilsObjectNameEXT SetName;
PFN_vkSetDebugUtilsObjectTagEXT SetTag;
PFN_vkQueueBeginDebugUtilsLabelEXT QueueBegin;
PFN_vkQueueEndDebugUtilsLabelEXT QueueEnd;
PFN_vkQueueInsertDebugUtilsLabelEXT QueueInsert;
PFN_vkCmdBeginDebugUtilsLabelEXT CmdBegin;
PFN_vkCmdEndDebugUtilsLabelEXT CmdEnd;
PFN_vkCmdInsertDebugUtilsLabelEXT CmdInsert;
};//struct DebugUtilsFunction
class DebugUtils
@ -84,8 +91,13 @@ public:
DU_FUNC(IndirectCommandsLayoutNV, INDIRECT_COMMANDS_LAYOUT_NV)
// DU_FUNC(BufferCollectionFuchsia, BUFFER_COLLECTION_FUCHSIA)
void Begin(VkCommandBuffer,const char *,const Color4f &color=Color4f(1,1,1,1));
void End(VkCommandBuffer cmd_buf){duf.End(cmd_buf);}
void QueueBegin (VkQueue,const char *,const Color4f &color=Color4f(1,1,1,1));
void QueueEnd (VkQueue q){duf.QueueEnd(q);}
void QueueInsert (VkQueue q,const char *,const Color4f &color=Color4f(1,1,1,1));
void CmdBegin (VkCommandBuffer,const char *,const Color4f &color=Color4f(1,1,1,1));
void CmdEnd (VkCommandBuffer cmd_buf){duf.CmdEnd(cmd_buf);}
void CmdInsert (VkCommandBuffer cmd_buf,const char *,const Color4f &color=Color4f(1,1,1,1));
};//class DebugUtils
VK_NAMESPACE_END
#endif//HGL_GRAPH_VULKAN_DEBUG_UTILS_INCLUDE

67
src/SceneGraph/Vulkan/Debug/VKDebugUtils.cpp
View File

@ -1,6 +1,26 @@
#include<hgl/graph/VKDebugUtils.h>
VK_NAMESPACE_BEGIN
DebugUtils *CreateDebugUtils(VkDevice device)
{
DebugUtilsFunction duf;
#define DUF_GETFUNC(n,N) duf.n=(PFN_vk##N##EXT)vkGetDeviceProcAddr(device,"vk"#N"EXT");if(!duf.##n)return(nullptr);
DUF_GETFUNC(SetName, SetDebugUtilsObjectName );
DUF_GETFUNC(SetTag, SetDebugUtilsObjectTag );
DUF_GETFUNC(QueueBegin, QueueBeginDebugUtilsLabel );
DUF_GETFUNC(QueueEnd, QueueEndDebugUtilsLabel );
DUF_GETFUNC(QueueInsert,QueueInsertDebugUtilsLabel );
DUF_GETFUNC(CmdBegin, CmdBeginDebugUtilsLabel );
DUF_GETFUNC(CmdEnd, CmdEndDebugUtilsLabel );
DUF_GETFUNC(CmdInsert, CmdInsertDebugUtilsLabel );
return(new DebugUtils(device,duf));
}
void DebugUtils::SetName(VkObjectType type,uint64_t handle,const char *name)
{
VkDebugUtilsObjectNameInfoEXT name_info={};
@ -13,30 +33,45 @@ void DebugUtils::SetName(VkObjectType type,uint64_t handle,const char *name)
duf.SetName(device,&name_info);
}
void DebugUtils::Begin(VkCommandBuffer cmd_buf,const char *name,const Color4f &color)
struct DebugUtilsLabel:public VkDebugUtilsLabelEXT
{
VkDebugUtilsLabelEXT label={};
DebugUtilsLabel(const char *n,const Color4f &c)
{
sType=VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
pNext=nullptr;
pLabelName=n;
color[0]=c.r;
color[1]=c.g;
color[2]=c.b;
color[3]=c.a;
}
};//struct DebugUtilsLabel
label.sType=VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
label.pLabelName=name;
memcpy(label.color,&color,sizeof(float)*4);
void DebugUtils::QueueBegin(VkQueue q,const char *name,const Color4f &color)
{
DebugUtilsLabel label(name,color);
duf.Begin(cmd_buf,&label);
duf.QueueBegin(q,&label);
}
DebugUtils *CreateDebugUtils(VkDevice device)
void DebugUtils::QueueInsert(VkQueue q,const char *name,const Color4f &color)
{
DebugUtilsFunction duf;
DebugUtilsLabel label(name,color);
duf.SetName =(PFN_vkSetDebugUtilsObjectNameEXT )vkGetDeviceProcAddr(device,"vkSetDebugUtilsObjectNameEXT");
duf.Begin =(PFN_vkCmdBeginDebugUtilsLabelEXT )vkGetDeviceProcAddr(device,"vkCmdBeginDebugUtilsLabelEXT");
duf.End =(PFN_vkCmdEndDebugUtilsLabelEXT )vkGetDeviceProcAddr(device,"vkCmdEndDebugUtilsLabelEXT");
duf.QueueInsert(q,&label);
}
if(!duf.SetName
||!duf.Begin
||!duf.End)
return(nullptr);
void DebugUtils::CmdBegin(VkCommandBuffer cmd_buf,const char *name,const Color4f &color)
{
DebugUtilsLabel label(name,color);
return(new DebugUtils(device,duf));
duf.CmdBegin(cmd_buf,&label);
}
void DebugUtils::CmdInsert(VkCommandBuffer cmd_buf,const char *name,const Color4f &color)
{
DebugUtilsLabel label(name,color);
duf.CmdInsert(cmd_buf,&label);
}
VK_NAMESPACE_END

4
src/SceneGraph/Vulkan/VKCommandBuffer.cpp
View File

@ -41,7 +41,7 @@ void GPUCmdBuffer::BeginRegion(const char *region_name,const Color4f &color)
dev_attr->debug_maker->Begin(cmd_buf,region_name,color);
if(dev_attr->debug_utils)
dev_attr->debug_utils->Begin(cmd_buf,region_name,color);
dev_attr->debug_utils->CmdBegin(cmd_buf,region_name,color);
}
void GPUCmdBuffer::EndRegion()
@ -50,7 +50,7 @@ void GPUCmdBuffer::EndRegion()
dev_attr->debug_maker->End(cmd_buf);
if(dev_attr->debug_utils)
dev_attr->debug_utils->End(cmd_buf);
dev_attr->debug_utils->CmdEnd(cmd_buf);
}
#endif
VK_NAMESPACE_END