From a58589f01fdcc10ac5a81442c0e5d621819925da Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 13 Oct 2023 10:47:42 +0800 Subject: [PATCH] moved AddBuffer to .h for RenderResource --- inc/hgl/graph/VKRenderResource.h | 16 +++++++++++++++- src/SceneGraph/Vulkan/VKRenderResource.cpp | 17 ----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index 6cc0cb62..5e1ab10d 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -16,6 +16,7 @@ #include #include #include +#include VK_NAMESPACE_BEGIN @@ -61,7 +62,20 @@ class RenderResource private: - void AddBuffer(const AnsiString &buf_name,DeviceBuffer *buf); + void AddBuffer(const AnsiString &buf_name,DeviceBuffer *buf) + { + rm_buffers.Add(buf); + + #ifdef _DEBUG + DebugUtils *du=device->GetDebugUtils(); + + if(du) + { + du->SetBuffer(buf->GetBuffer(),buf_name+":Buffer"); + du->SetDeviceMemory(buf->GetVkMemory(),buf_name+":Memory"); + } + #endif//_DEBUG + } public: diff --git a/src/SceneGraph/Vulkan/VKRenderResource.cpp b/src/SceneGraph/Vulkan/VKRenderResource.cpp index f82912fd..a02274b1 100644 --- a/src/SceneGraph/Vulkan/VKRenderResource.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResource.cpp @@ -17,23 +17,6 @@ VBO *RenderResource::CreateVBO(VkFormat format,uint32_t count,const void *data,S return vb; } -void RenderResource::AddBuffer(const AnsiString &buf_name,DeviceBuffer *buf) -{ - if(!buf)return; - - rm_buffers.Add(buf); - -#ifdef _DEBUG - DebugUtils *du=device->GetDebugUtils(); - - if(du) - { - du->SetBuffer(buf->GetBuffer(),buf_name+":Buffer"); - du->SetDeviceMemory(buf->GetVkMemory(),buf_name+":Memory"); - } -#endif//_DEBUG -} - #define SCENE_DB_CREATE_BUFFER(name) DeviceBuffer *RenderResource::Create##name(const AnsiString &buf_name,VkDeviceSize size,void *data,SharingMode sharing_mode) \ { \ DeviceBuffer *buf=device->Create##name(size,data,sharing_mode); \