From ffaa038f99c08f5de5972098bf4c8cc5c1af83a9 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sun, 26 Jan 2025 12:36:23 +0800
Subject: [PATCH] Use RenderPass * instead of VkRenderPass in Framebuffer

---
 inc/hgl/graph/VKFramebuffer.h                   | 8 ++++----
 inc/hgl/graph/VKRenderTarget.h                  | 8 ++++----
 src/SceneGraph/Vulkan/VKCommandBufferRender.cpp | 2 +-
 src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp   | 2 +-
 src/SceneGraph/Vulkan/VKFramebuffer.cpp         | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/inc/hgl/graph/VKFramebuffer.h b/inc/hgl/graph/VKFramebuffer.h
index af0ace67..78a4cba3 100644
--- a/inc/hgl/graph/VKFramebuffer.h
+++ b/inc/hgl/graph/VKFramebuffer.h
@@ -1,13 +1,13 @@
 #ifndef HGL_GRAPH_VULKAN_FRAMEBUFFER_INCLUDE
 #define HGL_GRAPH_VULKAN_FRAMEBUFFER_INCLUDE
 
-#include<hgl/graph/VK.h>
+#include<hgl/graph/VKRenderPass.h>
 VK_NAMESPACE_BEGIN
 class Framebuffer
 {
     VkDevice device;
     VkFramebuffer frame_buffer;
-    VkRenderPass render_pass;
+    RenderPass *render_pass;
 
     VkExtent2D extent;
     uint32_t attachment_count;
@@ -18,7 +18,7 @@ private:
 
     friend class RenderTargetManager;
 
-    Framebuffer(VkDevice,VkFramebuffer,const VkExtent2D &,VkRenderPass,uint32_t color_count,bool depth);
+    Framebuffer(VkDevice,VkFramebuffer,const VkExtent2D &,RenderPass *,uint32_t color_count,bool depth);
 
 public:
 
@@ -27,7 +27,7 @@ public:
     operator VkFramebuffer(){return frame_buffer;}
 
     const   VkFramebuffer   GetFramebuffer      ()const{return frame_buffer;}
-    const   VkRenderPass    GetRenderPass       ()const{return render_pass;}
+            RenderPass *    GetRenderPass       ()const{return render_pass;}
 
     const   VkExtent2D &    GetExtent           ()const{return extent;}
 
diff --git a/inc/hgl/graph/VKRenderTarget.h b/inc/hgl/graph/VKRenderTarget.h
index 474936e0..ddd637f8 100644
--- a/inc/hgl/graph/VKRenderTarget.h
+++ b/inc/hgl/graph/VKRenderTarget.h
@@ -62,10 +62,10 @@ public:
     
                     DeviceQueue *   GetQueue            ()      {return queue;}
             const   VkExtent2D &    GetExtent           ()const {return extent;}
-    virtual const   VkRenderPass    GetVkRenderPass     ()const {return fbo->GetRenderPass();}
-    virtual         uint32_t        GetColorCount       ()const {return fbo->GetColorCount();}
-    virtual         Framebuffer *   GetFramebuffer      ()      {return fbo;}
+    virtual         RenderPass *    GetRenderPass       ()      {return GetFramebuffer()->GetRenderPass();}
+    virtual         uint32_t        GetColorCount       ()      {return GetFramebuffer()->GetColorCount();}
 
+    virtual         Framebuffer *   GetFramebuffer      ()      {return fbo;}
     virtual         Texture2D *     GetColorTexture     (const int index=0){return color_textures[index];}
     virtual         Texture2D *     GetDepthTexture     (){return depth_texture;}
 
@@ -96,7 +96,7 @@ public:
     RTSwapchain(VkDevice dev,Swapchain *sc,DeviceQueue *q,Semaphore *rcs,Semaphore *pcs,RenderPass *rp);
     ~RTSwapchain();
     
-            uint32_t            GetColorCount           ()const override            {return 1;}
+            uint32_t            GetColorCount           ()      override            {return 1;}
             uint32_t            GetImageCount           ()const                     {return swapchain->image_count;}
             uint32_t            GetCurrentFrameIndices  ()const                     {return current_frame;}
 
diff --git a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
index 91e02c3d..ec7d8ea9 100644
--- a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
+++ b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
@@ -59,7 +59,7 @@ bool RenderCmdBuffer::BindFramebuffer(Framebuffer *fbo)
     render_area.offset.y=0;
     render_area.extent=fbo->GetExtent();
 
-    rp_begin.renderPass         = fbo->GetRenderPass();
+    rp_begin.renderPass         = *fbo->GetRenderPass();
     rp_begin.framebuffer        = *fbo;
     rp_begin.renderArea         = render_area;
     rp_begin.clearValueCount    = cv_count;
diff --git a/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp b/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp
index 95cf1a09..cdb60427 100644
--- a/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp
+++ b/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp
@@ -75,7 +75,7 @@ Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,ImageView **color_lis
     if(!fbo)
         return(nullptr);
 
-    return(new Framebuffer(GetVkDevice(),fbo,extent,rp->GetVkRenderPass(),color_count,depth));
+    return(new Framebuffer(GetVkDevice(),fbo,extent,rp,color_count,depth));
 }
 //
 //Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,List<ImageView *> &color,ImageView *depth)
diff --git a/src/SceneGraph/Vulkan/VKFramebuffer.cpp b/src/SceneGraph/Vulkan/VKFramebuffer.cpp
index eb2d086a..32de2677 100644
--- a/src/SceneGraph/Vulkan/VKFramebuffer.cpp
+++ b/src/SceneGraph/Vulkan/VKFramebuffer.cpp
@@ -7,7 +7,7 @@
 
 VK_NAMESPACE_BEGIN
 
-Framebuffer::Framebuffer(VkDevice dev,VkFramebuffer fb,const VkExtent2D &ext,VkRenderPass rp,uint32_t cc,bool depth)
+Framebuffer::Framebuffer(VkDevice dev,VkFramebuffer fb,const VkExtent2D &ext,RenderPass *rp,uint32_t cc,bool depth)
 {
     device=dev;
     frame_buffer=fb;