From 774f106738144bd69827f561246c2d36d1e405be Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 12 Mar 2025 01:25:49 +0800 Subject: [PATCH] example 0/1 run OK on newly RenderTarget --- inc/hgl/WorkManager.h | 5 +- inc/hgl/graph/VK.h | 2 + inc/hgl/graph/VKRenderTargetData.h | 8 ++- inc/hgl/graph/VKRenderTargetMultiFrame.h | 50 +++++++++--------- inc/hgl/graph/VKRenderTargetSingle.h | 13 ++--- inc/hgl/graph/VKRenderTargetSwapchain.h | 6 +-- inc/hgl/graph/module/SwapchainModule.h | 2 +- src/SceneGraph/Vulkan/VKRenderTargetData.cpp | 27 ++++++++++ .../Vulkan/VKSwapchainRenderTarget.cpp | 52 ++++++------------- src/SceneGraph/module/SwapchainModule.cpp | 16 +++--- src/Work/WorkManager.cpp | 7 ++- 11 files changed, 103 insertions(+), 85 deletions(-) diff --git a/inc/hgl/WorkManager.h b/inc/hgl/WorkManager.h index 549bd11c..6c690233 100644 --- a/inc/hgl/WorkManager.h +++ b/inc/hgl/WorkManager.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace hgl { @@ -49,13 +50,13 @@ namespace hgl class SwapchainWorkManager:public WorkManager,public io::WindowEvent { - graph::SwapchainModule *swpachain_module; + graph::SwapchainModule *swapchain_module; public: SwapchainWorkManager(graph::RenderFramework *rf):WorkManager(rf) { - swpachain_module=rf->GetSwapchainModule(); + swapchain_module=rf->GetSwapchainModule(); render_framework->Join(this); } diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index dcbbe923..d17a56f7 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -35,6 +35,8 @@ struct VertexAttribDataPtr using BindingMap =Map; using BindingMapArray =BindingMap[VK_DESCRIPTOR_TYPE_RANGE_SIZE]; +class DescriptorBinding; + class GraphModule; class RenderFramework; diff --git a/inc/hgl/graph/VKRenderTargetData.h b/inc/hgl/graph/VKRenderTargetData.h index ccccf5db..6d6ae345 100644 --- a/inc/hgl/graph/VKRenderTargetData.h +++ b/inc/hgl/graph/VKRenderTargetData.h @@ -1,6 +1,6 @@ #pragma once -#include +#include VK_NAMESPACE_BEGIN @@ -26,6 +26,12 @@ public: return color_textures[index]; } + bool Submit(Semaphore *wait_sem); + + RenderCmdBuffer *BeginRender(DescriptorBinding *); + + void EndRender(); + virtual void Clear(); };//struct RenderTargetData diff --git a/inc/hgl/graph/VKRenderTargetMultiFrame.h b/inc/hgl/graph/VKRenderTargetMultiFrame.h index 8974341c..1a3c5cd0 100644 --- a/inc/hgl/graph/VKRenderTargetMultiFrame.h +++ b/inc/hgl/graph/VKRenderTargetMultiFrame.h @@ -31,64 +31,66 @@ protected: public: - virtual ~MultiFrameRenderTarget() override; + virtual ~MultiFrameRenderTarget() override + { + for(uint32_t i=0;i=frame_number) current_frame=0; + + return(true); } uint32_t GetCurrentFrameIndices ()const{return current_frame;} uint32_t GetFrameCount ()const{return frame_number;} - RenderTarget * GetCurrentFrameRenderTarget (){return rt_list[current_frame];} public: - Framebuffer * GetFramebuffer ()override{return rt_list[current_frame]->GetFramebuffer();} - RenderPass * GetRenderPass ()override{return rt_list[current_frame]->GetRenderPass();} + Framebuffer * GetFramebuffer ()override{return rtd_list[current_frame].fbo;} + RenderPass * GetRenderPass ()override{return rtd_list[current_frame].fbo->GetRenderPass();} - uint32_t GetColorCount ()override{return rt_list[current_frame]->GetColorCount();} + uint32_t GetColorCount ()override{return rtd_list[current_frame].color_count;} - Texture2D * GetColorTexture (const int index=0) override{return rt_list[current_frame]->GetColorTexture(index);} - Texture2D * GetDepthTexture () override{return rt_list[current_frame]->GetDepthTexture();} + Texture2D * GetColorTexture (const int index=0) override{return rtd_list[current_frame].GetColorTexture(index);} + Texture2D * GetDepthTexture () override{return rtd_list[current_frame].depth_texture;} - bool hasDepth ()override{return rt_list[current_frame]->hasDepth();} + bool hasDepth ()override{return rtd_list[current_frame].depth_texture;} public: // Command Buffer - DeviceQueue * GetQueue ()override{return rt_list[current_frame]->GetQueue();} - Semaphore * GetRenderCompleteSemaphore()override{return rt_list[current_frame]->GetRenderCompleteSemaphore();} - RenderCmdBuffer * GetRenderCmdBuffer ()override{return rt_list[current_frame]->GetRenderCmdBuffer();} + DeviceQueue * GetQueue ()override{return rtd_list[current_frame].queue;} + Semaphore * GetRenderCompleteSemaphore ()override{return rtd_list[current_frame].render_complete_semaphore;} + RenderCmdBuffer * GetRenderCmdBuffer ()override{return rtd_list[current_frame].cmd_buf;} - Framebuffer * GetFramebuffer (const uint32_t index){return rt_list[index]->GetFramebuffer();} - RenderCmdBuffer * GetRenderCmdBuffer (const uint32_t index){return rt_list[index]->GetRenderCmdBuffer();} + Framebuffer * GetFramebuffer (const uint32_t index){return rtd_list[index].fbo;} + RenderCmdBuffer * GetRenderCmdBuffer (const uint32_t index){return rtd_list[index].cmd_buf;} - virtual bool Submit ()override{return rt_list[current_frame]->Submit(nullptr);} + virtual bool Submit (Semaphore *wait_sem)override{return rtd_list[current_frame].Submit(wait_sem);} - virtual bool Submit (Semaphore *wait_sem) override - { - return rt_list[current_frame]->Submit(wait_sem); - } - - bool WaitQueue ()override{return rt_list[current_frame]->WaitQueue();} - bool WaitFence ()override{return rt_list[current_frame]->WaitFence();} + bool WaitQueue ()override{return rtd_list[current_frame].queue->WaitQueue();} + bool WaitFence ()override{return rtd_list[current_frame].queue->WaitFence();} public: virtual RenderCmdBuffer *BeginRender()override { //std::cout<<"Begin Render frame="<BeginRender(); + return rtd_list[current_frame].BeginRender(GetDescriptorBinding()); } virtual void EndRender() override { //std::cout<<"End Render frame="<EndRender(); + rtd_list[current_frame].EndRender(); } };//class MultiFrameRenderTarget diff --git a/inc/hgl/graph/VKRenderTargetSingle.h b/inc/hgl/graph/VKRenderTargetSingle.h index 3db86131..acbe6f89 100644 --- a/inc/hgl/graph/VKRenderTargetSingle.h +++ b/inc/hgl/graph/VKRenderTargetSingle.h @@ -57,7 +57,7 @@ public: // Command Buffer if(!data) return(false); - return data->queue->Submit(data->cmd_buf,wait_sem,data->render_complete_semaphore); + return data->Submit(wait_sem); } bool WaitQueue ()override{return data->queue->WaitQueue();} @@ -67,21 +67,18 @@ public: virtual RenderCmdBuffer *BeginRender()override { - if(!data->cmd_buf) + if(!data) return(nullptr); - data->cmd_buf->Begin(); - data->cmd_buf->SetDescriptorBinding(GetDescriptorBinding()); - data->cmd_buf->BindFramebuffer(data->fbo); - return data->cmd_buf; + return data->BeginRender(GetDescriptorBinding()); } virtual void EndRender() override { - if(!data->cmd_buf) + if(!data) return; - data->cmd_buf->End(); + data->EndRender(); } };//class RenderTarget diff --git a/inc/hgl/graph/VKRenderTargetSwapchain.h b/inc/hgl/graph/VKRenderTargetSwapchain.h index 854a3576..fed8361f 100644 --- a/inc/hgl/graph/VKRenderTargetSwapchain.h +++ b/inc/hgl/graph/VKRenderTargetSwapchain.h @@ -16,7 +16,7 @@ class SwapchainRenderTarget:public MultiFrameRenderTarget private: - SwapchainRenderTarget(RenderFramework *rf,Swapchain *sc,Semaphore *pcs,RenderTarget **rtl); + SwapchainRenderTarget(RenderFramework *rf,Swapchain *sc,Semaphore *pcs,RenderTargetData *rtdl); friend class SwapchainModule; friend class RenderTargetManager; @@ -27,9 +27,9 @@ public: public: - IRenderTarget *AcquireNextImage(); ///<获取下一帧的索引 + bool NextFrame ()override; ///<获取下一帧的索引 - bool Submit()override; ///<提交当前帧的渲染，交推送到前台 + bool Submit ()override; ///<提交当前帧的渲染，交推送到前台 };//class SwapchainRenderTarget:public MultiFrameRenderTarget VK_NAMESPACE_END diff --git a/inc/hgl/graph/module/SwapchainModule.h b/inc/hgl/graph/module/SwapchainModule.h index 27f46722..230526e6 100644 --- a/inc/hgl/graph/module/SwapchainModule.h +++ b/inc/hgl/graph/module/SwapchainModule.h @@ -40,7 +40,7 @@ public: bool GetSwapchainSize(VkExtent2D *)const; SwapchainRenderTarget * GetRenderTarget ()const{return sc_render_target;} - IRenderTarget * AcquireNextImage()const; + bool AcquireNextImage()const; };//class SwapchainModule:public GraphModule VK_NAMESPACE_END diff --git a/src/SceneGraph/Vulkan/VKRenderTargetData.cpp b/src/SceneGraph/Vulkan/VKRenderTargetData.cpp index 508ad10e..2c499278 100644 --- a/src/SceneGraph/Vulkan/VKRenderTargetData.cpp +++ b/src/SceneGraph/Vulkan/VKRenderTargetData.cpp @@ -5,6 +5,33 @@ VK_NAMESPACE_BEGIN +bool RenderTargetData::Submit(Semaphore *wait_sem) +{ + if(!queue||!cmd_buf||!render_complete_semaphore) + return(false); + + return queue->Submit(cmd_buf,wait_sem,render_complete_semaphore); +} + +RenderCmdBuffer *RenderTargetData::BeginRender(DescriptorBinding *db) +{ + if(!cmd_buf) + return(nullptr); + + cmd_buf->Begin(); + cmd_buf->SetDescriptorBinding(db); + cmd_buf->BindFramebuffer(fbo); + return cmd_buf; +} + +void RenderTargetData::EndRender() +{ + if(!cmd_buf) + return; + + cmd_buf->End(); +} + void RenderTargetData::Clear() { SAFE_CLEAR(queue); diff --git a/src/SceneGraph/Vulkan/VKSwapchainRenderTarget.cpp b/src/SceneGraph/Vulkan/VKSwapchainRenderTarget.cpp index 0b5fd904..0c7dce74 100644 --- a/src/SceneGraph/Vulkan/VKSwapchainRenderTarget.cpp +++ b/src/SceneGraph/Vulkan/VKSwapchainRenderTarget.cpp @@ -1,10 +1,10 @@ -#include +#include #include #include //#include VK_NAMESPACE_BEGIN -SwapchainRenderTarget::SwapchainRenderTarget(RenderFramework *rf,Swapchain *sc,Semaphore *pcs,RenderTarget **rtl):MultiFrameRenderTarget(rf,sc->image_count,rtl) +SwapchainRenderTarget::SwapchainRenderTarget(RenderFramework *rf,Swapchain *sc,Semaphore *pcs,RenderTargetData *rtl):MultiFrameRenderTarget(rf,sc->image_count,rtl) { swapchain=sc; @@ -15,10 +15,6 @@ SwapchainRenderTarget::SwapchainRenderTarget(RenderFramework *rf,Swapchain *sc,S present_info.pSwapchains = &(swapchain->swap_chain); present_complete_semaphore=pcs; - - VkSemaphore sem=*present_complete_semaphore; - -// std::cout<<"present complete semaphore : "<swap_chain, - UINT64_MAX, - sem, - VK_NULL_HANDLE, - ¤t_frame)!=VK_SUCCESS) - return(nullptr); - - //std::cerr<<"AcquireNextImage current_frame="<swap_chain, + UINT64_MAX, + *present_complete_semaphore, + VK_NULL_HANDLE, + ¤t_frame)==VK_SUCCESS); } bool SwapchainRenderTarget::Submit() { - IRenderTarget *rt=rt_list[current_frame]; - - //std::cout<<"submit frame="<Submit(present_complete_semaphore)) + if(!rtd->Submit(present_complete_semaphore)) return(false); DeviceQueue *queue=GetQueue(); - VkSemaphore wait_semaphores=*rt->GetRenderCompleteSemaphore(); + VkSemaphore wait_semaphores=*rtd->render_complete_semaphore; present_info.waitSemaphoreCount =1; present_info.pWaitSemaphores =&wait_semaphores; present_info.pImageIndices =¤t_frame; -// std::cout<<"present frame="<Present(&present_info); if (!((result == VK_SUCCESS) || (result == VK_SUBOPTIMAL_KHR))) { - if (result == VK_ERROR_OUT_OF_DATE_KHR) { - // Swap chain is no longer compatible with the surface and needs to be recreated - - return false; - } - } + if (result == VK_ERROR_OUT_OF_DATE_KHR) + { + return false; + } + } return(true); } diff --git a/src/SceneGraph/module/SwapchainModule.cpp b/src/SceneGraph/module/SwapchainModule.cpp index 27691058..e5056b45 100644 --- a/src/SceneGraph/module/SwapchainModule.cpp +++ b/src/SceneGraph/module/SwapchainModule.cpp @@ -199,14 +199,13 @@ bool SwapchainModule::CreateSwapchainRenderTarget() GPUDevice *device=GetDevice(); - RenderTarget **rt_list=new RenderTarget*[swapchain->image_count]; + SwapchainRenderTargetData *rtd_list=new SwapchainRenderTargetData[swapchain->image_count]; + SwapchainRenderTargetData *rtd=rtd_list; SwapchainImage *sc_image=swapchain->sc_image; for(uint32_t i=0;iimage_count;i++) { - RenderTargetData *rtd=new SwapchainRenderTargetData{}; - rtd->fbo =sc_image->fbo; rtd->queue =device->CreateQueue(swapchain->image_count,false); rtd->render_complete_semaphore =device->CreateGPUSemaphore(); @@ -218,15 +217,14 @@ bool SwapchainModule::CreateSwapchainRenderTarget() rtd->color_textures[0] =sc_image->color; rtd->depth_texture =sc_image->depth; - rt_list[i]=new RenderTarget(GetRenderFramework(),rtd); - + ++rtd; ++sc_image; } sc_render_target=new SwapchainRenderTarget( GetRenderFramework(), swapchain, device->CreateGPUSemaphore(), - rt_list + rtd_list ); return true; @@ -293,12 +291,12 @@ void SwapchainModule::OnResize(const VkExtent2D &extent) return(true); } - IRenderTarget * SwapchainModule::AcquireNextImage()const + bool SwapchainModule::AcquireNextImage()const { if(!sc_render_target) - return(nullptr); + return(false); - return sc_render_target->AcquireNextImage(); + return sc_render_target->NextFrame(); } VK_NAMESPACE_END diff --git a/src/Work/WorkManager.cpp b/src/Work/WorkManager.cpp index 423caf0b..38a8d530 100644 --- a/src/Work/WorkManager.cpp +++ b/src/Work/WorkManager.cpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include namespace hgl { @@ -40,7 +40,10 @@ namespace hgl void SwapchainWorkManager::Render(WorkObject *wo) { - graph::IRenderTarget *rt=swpachain_module->AcquireNextImage(); + if(!swapchain_module->AcquireNextImage()) + return; + + graph::SwapchainRenderTarget *rt=swapchain_module->GetRenderTarget(); wo->MarkRenderDirty(); //临时的，未来会被更好的机制替代 WorkManager::Render(wo);