From ac03ae4e44fb2b8b6a962b53b88e45436e713fbd Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 1 Jul 2024 23:29:59 +0800 Subject: [PATCH] renamed to SAFE_CLEAR_OBJECT_ARRAY_OBJECT from SAFE_CLEAR_OBJECT_ARRAY --- example/common/VulkanAppFramework.h | 4 ++-- src/SceneGraph/VertexDataManager.cpp | 2 +- src/SceneGraph/Vulkan/VKQueue.cpp | 4 ++-- src/SceneGraph/Vulkan/VKRenderTarget.cpp | 2 +- src/SceneGraph/Vulkan/VKSwapchain.cpp | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 8dd03a5b..1eaab635 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -83,7 +83,7 @@ public: win->Unjoin(this); SAFE_CLEAR(db); - SAFE_CLEAR_OBJECT_ARRAY(cmd_buf,swap_chain_count); + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(cmd_buf,swap_chain_count); SAFE_CLEAR(device); SAFE_CLEAR(win); @@ -197,7 +197,7 @@ public: void InitCommandBuffer() { if(cmd_buf) - SAFE_CLEAR_OBJECT_ARRAY(cmd_buf,swap_chain_count); + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(cmd_buf,swap_chain_count); sc_render_target=device->GetSwapchainRT(); diff --git a/src/SceneGraph/VertexDataManager.cpp b/src/SceneGraph/VertexDataManager.cpp index 036d6c3f..2723b30c 100644 --- a/src/SceneGraph/VertexDataManager.cpp +++ b/src/SceneGraph/VertexDataManager.cpp @@ -26,7 +26,7 @@ namespace hgl VertexDataManager::~VertexDataManager() { - SAFE_CLEAR_OBJECT_ARRAY(vab,vi_count); + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(vab,vi_count); SAFE_CLEAR(ibo); } diff --git a/src/SceneGraph/Vulkan/VKQueue.cpp b/src/SceneGraph/Vulkan/VKQueue.cpp index c3ada63d..7f7a09a0 100644 --- a/src/SceneGraph/Vulkan/VKQueue.cpp +++ b/src/SceneGraph/Vulkan/VKQueue.cpp @@ -1,4 +1,4 @@ -#include +#include #include VK_NAMESPACE_BEGIN @@ -21,7 +21,7 @@ DeviceQueue::DeviceQueue(VkDevice dev,VkQueue q,Fence **fl,const uint32_t fc) DeviceQueue::~DeviceQueue() { - SAFE_CLEAR_OBJECT_ARRAY(fence_list,fence_count) + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(fence_list,fence_count) } bool DeviceQueue::WaitQueue() diff --git a/src/SceneGraph/Vulkan/VKRenderTarget.cpp b/src/SceneGraph/Vulkan/VKRenderTarget.cpp index b27c2a2d..6f18ef54 100644 --- a/src/SceneGraph/Vulkan/VKRenderTarget.cpp +++ b/src/SceneGraph/Vulkan/VKRenderTarget.cpp @@ -53,7 +53,7 @@ RenderTarget::~RenderTarget() { SAFE_CLEAR(queue); SAFE_CLEAR(depth_texture); - SAFE_CLEAR_OBJECT_ARRAY(color_textures,color_count); + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(color_textures,color_count); SAFE_CLEAR(render_complete_semaphore); SAFE_CLEAR(fbo); diff --git a/src/SceneGraph/Vulkan/VKSwapchain.cpp b/src/SceneGraph/Vulkan/VKSwapchain.cpp index 60b65e5e..f0286eba 100644 --- a/src/SceneGraph/Vulkan/VKSwapchain.cpp +++ b/src/SceneGraph/Vulkan/VKSwapchain.cpp @@ -1,12 +1,12 @@ -#include +#include #include VK_NAMESPACE_BEGIN Swapchain::~Swapchain() { - SAFE_CLEAR_OBJECT_ARRAY(sc_fbo,color_count); + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(sc_fbo,color_count); SAFE_CLEAR(sc_depth); - SAFE_CLEAR_OBJECT_ARRAY(sc_color,color_count) + SAFE_CLEAR_OBJECT_ARRAY_OBJECT(sc_color,color_count) if(swap_chain) {