From a97440e1fcc4e7c109a92275d8150ff2c2b86991 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 11 May 2023 00:55:44 +0800 Subject: [PATCH] renamed to sc_fbo from render_frame --- inc/hgl/graph/VKRenderTarget.h | 4 ++-- inc/hgl/graph/VKSwapchain.h | 4 ++-- src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp | 12 ++++++------ src/SceneGraph/Vulkan/VKSwapchain.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/inc/hgl/graph/VKRenderTarget.h b/inc/hgl/graph/VKRenderTarget.h index 2e34fe03..faec8838 100644 --- a/inc/hgl/graph/VKRenderTarget.h +++ b/inc/hgl/graph/VKRenderTarget.h @@ -78,8 +78,8 @@ public: SwapchainRenderTarget(VkDevice dev,Swapchain *sc,DeviceQueue *q,Semaphore *rcs,Semaphore *pcs,RenderPass *rp); ~SwapchainRenderTarget(); - Framebuffer * GetFramebuffer ()override {return swapchain->render_frame[current_frame];} - Framebuffer * GetFramebuffer (const uint32_t index) {return swapchain->render_frame[index];} + Framebuffer * GetFramebuffer ()override {return swapchain->sc_fbo[current_frame];} + Framebuffer * GetFramebuffer (const uint32_t index) {return swapchain->sc_fbo[index];} const uint32_t GetColorCount ()const override {return 1;} const uint32_t GetImageCount ()const {return swapchain->color_count;} diff --git a/inc/hgl/graph/VKSwapchain.h b/inc/hgl/graph/VKSwapchain.h index 11b08af6..9a509193 100644 --- a/inc/hgl/graph/VKSwapchain.h +++ b/inc/hgl/graph/VKSwapchain.h @@ -15,12 +15,12 @@ public: VkSwapchainKHR swap_chain =VK_NULL_HANDLE; - uint32_t color_count=0; + uint32_t color_count =0; Texture2D ** sc_color =nullptr; Texture2D * sc_depth =nullptr; - Framebuffer ** render_frame =nullptr; + Framebuffer ** sc_fbo =nullptr; public: diff --git a/src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp b/src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp index 3d82510e..08527588 100644 --- a/src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp @@ -78,13 +78,13 @@ bool GPUDevice::CreateSwapchainFBO(Swapchain *swapchain) if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->color_count),sc_images)!=VK_SUCCESS) return(false); - swapchain->sc_depth =CreateTexture2D(new SwapchainDepthTextureCreateInfo(attr->physical_device->GetDepthFormat(),swapchain->extent)); + swapchain->sc_depth =CreateTexture2D(new SwapchainDepthTextureCreateInfo(attr->physical_device->GetDepthFormat(),swapchain->extent)); if(!swapchain->sc_depth) return(false); - swapchain->sc_color =hgl_zero_new(swapchain->color_count); - swapchain->render_frame =hgl_zero_new(swapchain->color_count); + swapchain->sc_color =hgl_zero_new(swapchain->color_count); + swapchain->sc_fbo =hgl_zero_new(swapchain->color_count); for(uint32_t i=0;icolor_count;i++) { @@ -93,9 +93,9 @@ bool GPUDevice::CreateSwapchainFBO(Swapchain *swapchain) if(!swapchain->sc_color[i]) return(false); - swapchain->render_frame[i]=CreateFBO( device_render_pass, - swapchain->sc_color[i]->GetImageView(), - swapchain->sc_depth->GetImageView()); + swapchain->sc_fbo[i]=CreateFBO( device_render_pass, + swapchain->sc_color[i]->GetImageView(), + swapchain->sc_depth->GetImageView()); } return(true); diff --git a/src/SceneGraph/Vulkan/VKSwapchain.cpp b/src/SceneGraph/Vulkan/VKSwapchain.cpp index 1e6a5edb..60b65e5e 100644 --- a/src/SceneGraph/Vulkan/VKSwapchain.cpp +++ b/src/SceneGraph/Vulkan/VKSwapchain.cpp @@ -4,7 +4,7 @@ VK_NAMESPACE_BEGIN Swapchain::~Swapchain() { - SAFE_CLEAR_OBJECT_ARRAY(render_frame,color_count); + SAFE_CLEAR_OBJECT_ARRAY(sc_fbo,color_count); SAFE_CLEAR(sc_depth); SAFE_CLEAR_OBJECT_ARRAY(sc_color,color_count)