refactored RenderTarget

.gitmodules

@@ -1,21 +1,21 @@
 [submodule "CMCMakeModule"]
 	path = CMCMakeModule
-	url = https://github.com/hyzboy/CMCMakeModule
+	url = http://www.hyzgame.com:3000/hyzboy/CMCMakeModule
 [submodule "CMCore"]
 	path = CMCore
-	url = https://github.com/hyzboy/CMCore
+	url = http://www.hyzgame.com:3000/hyzboy/CMCore
 [submodule "CMPlatform"]
 	path = CMPlatform
-	url = https://github.com/hyzboy/CMPlatform
+	url = http://www.hyzgame.com:3000/hyzboy/CMPlatform
 [submodule "CMAssetsManage"]
 	path = CMAssetsManage
-	url = https://github.com/hyzboy/CMAssetsManage.git
+	url = http://www.hyzgame.com:3000/hyzboy/CMAssetsManage.git
 [submodule "res"]
 	path = res
-	url = https://github.com/hyzboy/RuntimeData.git
+	url = http://www.hyzgame.com:3000/hyzboy/RuntimeData.git
 [submodule "CMSceneGraph"]
 	path = CMSceneGraph
-	url = https://github.com/hyzboy/CMSceneGraph.git
+	url = http://www.hyzgame.com:3000/hyzboy/CMSceneGraph.git
 [submodule "CMUtil"]
 	path = CMUtil
-	url = https://github.com/hyzboy/CMUtil.git
+	url = http://www.hyzgame.com:3000/hyzboy/CMUtil.git

CMCore

@@ -1 +1 @@
-Subproject commit 5aad7d81419d02141b3b3f53661e2c8e3e763163
+Subproject commit 9dd89aa5a34ef90b983895d32645df9b53cce955

CMSceneGraph

@@ -1 +1 @@
-Subproject commit 4949c2e3e82c8a88a783579aff120617c4ecfdab
+Subproject commit 2370ba12d7656da491f65be66d9e134484377866

example/common/VulkanAppFramework.h

@@ -54,15 +54,10 @@ protected:
 protected:
 
     GPUDevice *             device                      =nullptr;
-    RenderPass *            device_render_pass          =nullptr;
+    SwapchainRenderTarget *           sc_render_target            =nullptr;
-    RTSwapchain *           sc_render_target            =nullptr;
 
 protected:
 
-            int32_t         swap_chain_count            =0;
-
-    RenderCmdBuffer **      cmd_buf                     =nullptr;
-
             Color4f         clear_color;
 
 protected:
@@ -91,7 +86,6 @@ public:
         win->Unjoin(this);
 
         SAFE_CLEAR(db);
-        SAFE_CLEAR_OBJECT_ARRAY_OBJECT(cmd_buf,swap_chain_count);
 
         SAFE_CLEAR(device);
         SAFE_CLEAR(win);
@@ -146,14 +140,12 @@ public:
 
             if(!device)
                 return(false);
+
+            sc_render_target=device->GetSwapchainRT();
         }
 
-        device_render_pass=device->GetRenderPass();
-
         db=new RenderResource(device);
 
-        InitCommandBuffer();
-
         win->Join(this);
 
         {
@@ -198,34 +190,17 @@ public:
         if(w>0&&h>0)
             device->Resize(w,h);
 
-        InitCommandBuffer();
+        sc_render_target=device->GetSwapchainRT();
+
         Resize(w,h);
     }
 
-    void InitCommandBuffer()
+    bool BuildCommandBuffer(RenderCmdBuffer *cb,Framebuffer *fb,Renderable *ri)
-    {
-        if(cmd_buf)
-            SAFE_CLEAR_OBJECT_ARRAY_OBJECT(cmd_buf,swap_chain_count);
-
-        sc_render_target=device->GetSwapchainRT();
-
-        swap_chain_count=sc_render_target->GetImageCount();
-        {
-            const VkExtent2D extent=sc_render_target->GetExtent();
-
-            cmd_buf=hgl_zero_new<RenderCmdBuffer *>(swap_chain_count);
-
-            for(int32_t i=0;i<swap_chain_count;i++)
-                cmd_buf[i]=device->CreateRenderCommandBuffer(device->GetPhysicalDevice()->GetDeviceName()+AnsiString(":RenderCmdBuffer_")+AnsiString::numberOf(i));
-        }
-    }
-
-    bool BuildCommandBuffer(RenderCmdBuffer *cb,RenderPass *rp,Framebuffer *fb,Renderable *ri)
     {   
         if(!ri)return(false);
 
         cb->Begin();
-            cb->BindFramebuffer(rp,fb);
+            cb->BindFramebuffer(fb);
             cb->SetClearColor(0,clear_color);
             cb->BeginRenderPass();
                 cb->BindPipeline(ri->GetPipeline());
@@ -238,26 +213,30 @@ public:
         return(true);
     }
 
-    void BuildCommandBuffer(RenderCmdBuffer *cb,RenderTarget *rt,Renderable *ri)
+    bool BuildCommandBuffer(RenderCmdBuffer *cb,RenderTarget *rt,Renderable *ri)
     {
         if(!cb||!rt||!ri)
-            return;
+            return(false);
 
-        BuildCommandBuffer(cb,rt->GetRenderPass(),rt->GetFramebuffer(),ri);
+        return BuildCommandBuffer(cb,rt->GetFramebuffer(),ri);
     }
 
     bool BuildCommandBuffer(uint32_t index,Renderable *ri)
     {   
         if(!ri)return(false);
 
-        return BuildCommandBuffer(cmd_buf[index],sc_render_target->GetRenderPass(),sc_render_target->GetFramebuffer(index),ri);
+        IRenderTarget *rt=sc_render_target->GetCurrentFrameRenderTarget();
+
+        return BuildCommandBuffer(rt->GetRenderCmdBuffer(),
+                                  rt->GetFramebuffer(),
+                                  ri);
     }
 
     bool BuildCommandBuffer(Renderable *ri)
     {
         if(!ri)return(false);
 
-        for(int32_t i=0;i<swap_chain_count;i++)
+        for(uint32_t i=0;i<sc_render_target->GetFrameCount();i++)
             BuildCommandBuffer(i,ri);
 
         return(true);
@@ -274,10 +253,10 @@ public:
     {
         if(!rl)return;
 
-        RenderCmdBuffer *cb=cmd_buf[index];
+        RenderCmdBuffer *cb=sc_render_target->GetRenderCmdBuffer(index);
 
         cb->Begin();
-        cb->BindFramebuffer(sc_render_target->GetRenderPass(),sc_render_target->GetFramebuffer(index));        
+        cb->BindFramebuffer(sc_render_target->GetFramebuffer(index));        
         cb->SetClearColor(0,clear_color);
             cb->BeginRenderPass();
                 rl->Render(cb);
@@ -287,7 +266,7 @@ public:
 
     void BuildCommandBuffer(RenderList *rl)
     {
-        for(int32_t i=0;i<swap_chain_count;i++)
+        for(uint32_t i=0;i<sc_render_target->GetFrameCount();i++)
             BuildCommandBuffer(i,rl);
     }
 
@@ -299,7 +278,7 @@ public:
     template<typename ...ARGS>
     Pipeline *CreatePipeline(ARGS...args)
     {
-        Pipeline *p=device_render_pass->CreatePipeline(args...);
+        Pipeline *p=sc_render_target->GetRenderPass()->CreatePipeline(args...);
 
         if(!p)
             return(nullptr);
@@ -321,11 +300,9 @@ public:
         return sc_render_target->AcquireNextImage();
     }
 
-    virtual void SubmitDraw(int index)
+    virtual void SubmitDraw()
     {
-        VkCommandBuffer cb=*cmd_buf[index];
+        sc_render_target->Submit();
-
-        sc_render_target->Submit(cb);
         sc_render_target->PresentBackbuffer();
         sc_render_target->WaitQueue();
         sc_render_target->WaitFence();
@@ -335,9 +312,9 @@ public:
     {
         int index=AcquireNextImage();
 
-        if(index<0||index>=swap_chain_count)return;
+        if(index<0||index>=sc_render_target->GetFrameCount())return;
 
-        SubmitDraw(index);
+        SubmitDraw();
     }
 
     bool Run()
@@ -568,7 +545,7 @@ public:
 
         BuildCommandBuffer(index);
 
-        SubmitDraw(index);
+        SubmitDraw();
 
         ckc->Update();
         cmc->Update();

inc/hgl/graph/VK.h

@@ -37,7 +37,7 @@ class ImageView;
 class Framebuffer;
 struct Swapchain;
 class RenderTarget;
-class RTSwapchain;
+class SwapchainRenderTarget;
 
 class Texture;
 class Texture1D;

inc/hgl/graph/VKCommandBuffer.h

@@ -44,11 +44,12 @@ class RenderCmdBuffer:public GPUCmdBuffer
     VkRect2D render_area;
     VkViewport viewport;
    
-    Framebuffer *fbo;
     RenderPassBeginInfo rp_begin;
     VkPipelineLayout pipeline_layout;
 
-    void SetFBO(Framebuffer *);
+private:
+
+    void SetClear();
 
 public:
 
@@ -78,7 +79,7 @@ public:
 
     //以上设定在Begin开始后即不可改变
 
-    bool BindFramebuffer(RenderPass *rp,Framebuffer *fb);
+    bool BindFramebuffer(Framebuffer *);
 
     bool BeginRenderPass();
     void NextSubpass(){vkCmdNextSubpass(cmd_buf,VK_SUBPASS_CONTENTS_INLINE);}

inc/hgl/graph/VKDebugUtils.h

@@ -3,6 +3,7 @@
 
 #include<hgl/graph/VK.h>
 #include<hgl/color/Color4f.h>
+#include<hgl/graph/VKTexture.h>
 
 VK_NAMESPACE_BEGIN
 struct DebugUtilsFunction
@@ -93,6 +94,13 @@ public:
 
 #undef DU_FUNC
 
+    void SetTexture(Texture *tex,const AnsiString &info)
+    {   
+        SetImage(       tex->GetImage(),            info+"_Image"       );
+        SetImageView(   tex->GetVulkanImageView(),  info+"_ImageView"   );
+        SetDeviceMemory(tex->GetDeviceMemory(),     info+"_Memory"      );
+    }
+    
     void QueueBegin  (VkQueue,const char *,const Color4f &color=Color4f(1,1,1,1));
     void QueueEnd    (VkQueue q){duf.QueueEnd(q);}
     void QueueInsert (VkQueue q,const char *,const Color4f &color=Color4f(1,1,1,1));

inc/hgl/graph/VKDevice.h

@@ -38,11 +38,10 @@ class GPUDevice
 private:
 
     DeviceRenderPassManage *render_pass_manage;
-    RenderPass *device_render_pass;
 
-    RTSwapchain *sc_rt;
+    SwapchainRenderTarget *sc_rt;
 
-    RTSwapchain *CreateSwapchainRenderTarget();
+    SwapchainRenderTarget *CreateSwapchainRenderTarget();
 
     void InitRenderPassManage();
     void ClearRenderPassManage();
@@ -79,9 +78,9 @@ public:
     const       VkColorSpaceKHR     GetColorSpace       ()const {return attr->surface_format.colorSpace;}
                 VkQueue             GetGraphicsQueue    ()      {return attr->graphics_queue;}
 
-                RenderPass *        GetRenderPass       ()      {return device_render_pass;}
+                RenderPass *        GetRenderPass       ()      {return sc_rt->GetRenderPass();}
 
-                RTSwapchain *       GetSwapchainRT      ()      {return sc_rt;}
+                SwapchainRenderTarget *       GetSwapchainRT      ()      {return sc_rt;}
 
     const       VkExtent2D &        GetSwapchainSize    ()const {return sc_rt->GetExtent();}
 

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 GPUDevice;
 
-    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       ()     {return render_pass;}
 
     const   VkExtent2D &    GetExtent           ()const{return extent;}
 

inc/hgl/graph/VKPhysicalDevice.h

@@ -14,11 +14,13 @@ class GPUPhysicalDevice
     VkPhysicalDeviceVulkan11Features    features11;
     VkPhysicalDeviceVulkan12Features    features12;
     VkPhysicalDeviceVulkan13Features    features13;
+    VkPhysicalDeviceVulkan14Features    features14;
 
     VkPhysicalDeviceProperties          properties;
     VkPhysicalDeviceVulkan11Properties  properties11;
     VkPhysicalDeviceVulkan12Properties  properties12;
     VkPhysicalDeviceVulkan13Properties  properties13;
+    VkPhysicalDeviceVulkan14Properties  properties14;
 
     VkPhysicalDeviceMemoryProperties    memory_properties;
     List<VkLayerProperties>             layer_properties;
@@ -36,6 +38,7 @@ public:
     const VkPhysicalDeviceVulkan11Features &GetFeatures11       ()const{return features11;}
     const VkPhysicalDeviceVulkan12Features &GetFeatures12       ()const{return features12;}
     const VkPhysicalDeviceVulkan13Features &GetFeatures13       ()const{return features13;}
+    const VkPhysicalDeviceVulkan14Features &GetFeatures14       ()const{return features14;}
 
     const VkPhysicalDeviceProperties &      GetProperties       ()const{return properties;}
     const VkPhysicalDeviceMemoryProperties &GetMemoryProperties ()const{return memory_properties;}
@@ -68,6 +71,10 @@ public:
 
     const uint32_t          GetConstantSize ()const{return properties.limits.maxPushConstantsSize;}
 
+    const VkDeviceSize      GetMaxBufferSize()const{return properties13.maxBufferSize;}
+
+    const uint32_t          GetMaxPushDescriptors()const{return properties14.maxPushDescriptors;}
+
 public:
 
     /**
@@ -182,6 +189,9 @@ public:
     const VkBool32  SupportYcbcrConversion      ()const{return features11.samplerYcbcrConversion;}
     const VkBool32  SupportClampMirrorToEdge    ()const{return features12.samplerMirrorClampToEdge;}
 
+    const VkBool32  SupportSmoothLines          ()const{return features14.smoothLines;}
+    const VkBool32  SupportStippledSmoothLines  ()const{return features14.stippledSmoothLines;}
+
     const void      GetPointSize(float &granularity,float &min_size,float &max_size) const
     {
         granularity =properties.limits.pointSizeGranularity;

inc/hgl/graph/VKRenderPass.h

@@ -37,8 +37,10 @@ public:
 
     virtual ~RenderPass();
 
-            VkRenderPass    GetVkRenderPass(){return render_pass;}
+    operator const VkRenderPass()const{return render_pass;}
-            VkPipelineCache GetPipelineCache(){return pipeline_cache;}
+
+    const   VkRenderPass    GetVkRenderPass()const{return render_pass;}
+    const   VkPipelineCache GetPipelineCache()const{return pipeline_cache;}
 
     const uint              GetColorCount()const{return color_formats.GetCount();}
     const List<VkFormat> &  GetColorFormat()const{return color_formats;}

inc/hgl/graph/VKRenderTarget.h

@@ -1,5 +1,4 @@
-#ifndef HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE
+#pragma once
-#define HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE
 
 #include<hgl/graph/VK.h>
 #include<hgl/graph/VKRenderPass.h>
@@ -7,63 +6,216 @@
 #include<hgl/graph/VKSwapchain.h>
 #include<hgl/graph/VKQueue.h>
 #include<hgl/graph/VKPipeline.h>
+
 VK_NAMESPACE_BEGIN
 /**
- * 渲染目标
+* RenderTarget 存在几种情况：
+* 
+* 1.正常单帧渲染目标，即只有一帧的数据，每次渲染都是当前帧
+* 
+* 2.多帧渲染目标，即有多帧数据，每次渲染都是指定帧，典型的是Swapchain
+* 
+* 所以RenderTarget的其实是一个多态类，根据不同的情况，有不同的实现
 */
-class RenderTarget
+
+class IRenderTarget
 {
-protected:
-
-    DeviceQueue *queue;
-
-    RenderPass *render_pass;
-    Framebuffer *fbo;
-    
     VkExtent2D extent;
     
-    Semaphore *render_complete_semaphore =nullptr;
+public:
 
-protected:
+    const   VkExtent2D &GetExtent       ()const{return extent;}
 
-    uint32_t color_count;
+    virtual uint32_t    GetColorCount   ()=0;
-    Texture2D **color_textures;
+    virtual bool        hasDepth        ()=0;
-    Texture2D *depth_texture;
+
+public:
+
+    IRenderTarget(const VkExtent2D &ext){extent=ext;}
+    virtual ~IRenderTarget()=default;
+    
+    virtual Framebuffer *       GetFramebuffer  ()=0;
+    virtual RenderPass *        GetRenderPass   ()=0;
+
+    virtual Texture2D *         GetColorTexture (const int index=0)=0;
+    virtual Texture2D *         GetDepthTexture ()=0;
+
+public: // Command Buffer
+
+    virtual DeviceQueue *       GetQueue            ()=0;
+    virtual Semaphore *         GetRenderCompleteSemaphore()=0;
+
+    virtual RenderCmdBuffer *   GetRenderCmdBuffer  ()=0;
+
+    virtual bool                Submit              (Semaphore *wait_sem)=0;
+
+    virtual bool                Submit              (){return Submit(nullptr);}
+
+    virtual bool                WaitQueue           ()=0;
+    virtual bool                WaitFence           ()=0;
+};//class IRenderTarget
+
+struct RenderTargetData
+{
+    Framebuffer *       fbo;
+    DeviceQueue *       queue;
+    Semaphore *         render_complete_semaphore;
+
+    RenderCmdBuffer *   cmd_buf;
+
+    uint32_t            color_count;            ///<颜色成分数量
+    Texture2D **        color_textures;         ///<颜色成分纹理列表
+    Texture2D *         depth_texture;          ///<深度成分纹理
+
+public:
+
+    Texture2D *GetColorTexture(const uint32_t index)
+    {
+        if(index>=color_count)
+            return(nullptr);
+
+        return color_textures[index];
+    }
+
+    virtual void Clear();
+};//struct RenderTargetData
+
+/**
+ * 单帧渲染目标
+ */
+class RenderTarget:public IRenderTarget
+{
+    RenderTargetData *data;
 
 protected:
 
     friend class GPUDevice;
 
-    RenderTarget(DeviceQueue *,Semaphore *);
+    RenderTarget(RenderTargetData *rtd):IRenderTarget(rtd->fbo->GetExtent())
-    RenderTarget(DeviceQueue *,Semaphore *,RenderPass *_rp,Framebuffer *_fb,Texture2D **color_texture_list,const uint32_t color_count,Texture2D *depth_texture);
+    {
+        data=rtd;
+    }
 
 public:
 
-    virtual ~RenderTarget();
+    virtual ~RenderTarget()
+    {
+        if(data)
+        {
+            data->Clear();
+            delete data;
+        }
+    }
 
-                    DeviceQueue *   GetQueue            ()      {return queue;}
+    Framebuffer *       GetFramebuffer      ()override{return data->fbo;}
-            const   VkExtent2D &    GetExtent           ()const {return extent;}
+    RenderPass *        GetRenderPass       ()override{return data->fbo->GetRenderPass();}
-    virtual         RenderPass *    GetRenderPass       ()      {return render_pass;}
-    virtual const   VkRenderPass    GetVkRenderPass     ()const {return render_pass->GetVkRenderPass();}
-    virtual const   uint32_t        GetColorCount       ()const {return fbo->GetColorCount();}
-    virtual         Framebuffer *   GetFramebuffer      ()      {return fbo;}
 
-    virtual         Texture2D *     GetColorTexture     (const int index=0){return color_textures[index];}
+    uint32_t            GetColorCount       ()override{return data->color_count;}
-    virtual         Texture2D *     GetDepthTexture     (){return depth_texture;}
     
-public: // command buffer
+    bool                hasDepth            ()override{return data->depth_texture;}
 
-            Semaphore *     GetRenderCompleteSemaphore  (){return render_complete_semaphore;}
+    Texture2D *         GetColorTexture     (const int index=0) override{return data->GetColorTexture(index);}
-    virtual bool            Submit                      (RenderCmdBuffer *,Semaphore *present_complete_semaphore=nullptr);
+    Texture2D *         GetDepthTexture     ()                  override{return data->depth_texture;}
 
-            bool            WaitQueue(){return queue->WaitQueue();}
+public: // Command Buffer
-            bool            WaitFence(){return queue->WaitFence();}
+
+    DeviceQueue *       GetQueue            ()override{return data->queue;}
+    Semaphore *         GetRenderCompleteSemaphore()override{return data->render_complete_semaphore;}
+
+    RenderCmdBuffer *   GetRenderCmdBuffer  ()override{return data->cmd_buf;}
+
+    virtual bool        Submit              (Semaphore *wait_sem)override
+    {
+        if(!data)
+            return(false);
+
+        return data->queue->Submit(*data->cmd_buf,wait_sem,data->render_complete_semaphore);
+    }
+
+    bool                WaitQueue           ()override{return data->queue->WaitQueue();}
+    bool                WaitFence           ()override{return data->queue->WaitFence();}
 };//class RenderTarget
 
+/**
+* 多帧渲染目标
+*/
+class MFRenderTarget:public IRenderTarget
+{
+protected:
+
+    uint32_t frame_number;
+    uint32_t current_frame;
+
+    RenderTarget **rt_list;
+
+protected:
+
+    friend class GPUDevice;
+
+    MFRenderTarget(const uint32_t fn,RenderTarget **rtl):IRenderTarget(rtl[0]->GetFramebuffer()->GetExtent())
+    {
+        frame_number=fn;
+        current_frame=0;
+
+        rt_list=rtl;
+    }
+
+public:
+
+    virtual ~MFRenderTarget()
+    {
+        SAFE_CLEAR_OBJECT_ARRAY_OBJECT(rt_list,frame_number);
+    }
+
+    virtual void        NextFrame()
+    {
+        ++current_frame;
+
+        if(current_frame>=frame_number)
+            current_frame=0;
+    }
+    
+    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();}
+
+    uint32_t            GetColorCount       ()override{return rt_list[current_frame]->GetColorCount();}
+
+    Texture2D *         GetColorTexture     (const int index=0) override{return rt_list[current_frame]->GetColorTexture(index);}
+    Texture2D *         GetDepthTexture     ()                  override{return rt_list[current_frame]->GetDepthTexture();}
+
+    
+    bool                hasDepth            ()override{return rt_list[current_frame]->hasDepth();}
+
+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();}
+    
+    Framebuffer *       GetFramebuffer      (const uint32_t index){return rt_list[index]->GetFramebuffer();}
+    RenderCmdBuffer *   GetRenderCmdBuffer  (const uint32_t index){return rt_list[index]->GetRenderCmdBuffer();}
+
+    virtual bool        Submit              ()override{return rt_list[current_frame]->Submit(nullptr);}
+    
+    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();}
+};//class MFRenderTarget
+
 /**
  * 交换链专用渲染目标
  */
-class RTSwapchain:public RenderTarget
+class SwapchainRenderTarget:public MFRenderTarget
 {
     VkDevice device;
     Swapchain *swapchain;
@@ -71,45 +223,25 @@ class RTSwapchain:public RenderTarget
 
     Semaphore *present_complete_semaphore=nullptr;
 
-    uint32_t current_frame;
+private:
+
+    SwapchainRenderTarget(VkDevice dev,Swapchain *sc,Semaphore *pcs,RenderTarget **rtl);
+
+    friend class GPUDevice;
 
 public:
 
-    RTSwapchain(VkDevice dev,Swapchain *sc,DeviceQueue *q,Semaphore *rcs,Semaphore *pcs,RenderPass *rp);
+    ~SwapchainRenderTarget();
-    ~RTSwapchain();
-
-                    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;}
-
-    virtual         Texture2D *     GetColorTexture (const int index=0) override{return swapchain->sc_color[index];}
-    virtual         Texture2D *     GetDepthTexture ()                  override{return swapchain->sc_depth;}
 
 public:
 
-            const   uint32_t        GetCurrentFrameIndices      ()const {return current_frame;}
+    int     AcquireNextImage();             ///<获取下一帧的索引
-                    Semaphore *     GetPresentCompleteSemaphore ()      {return present_complete_semaphore;}
 
-public:
+    bool    PresentBackbuffer();            ///<推送后台画面到前台
 
-    /**
+    bool    Submit()override
-     * 请求下一帧画面的索引
+    {
-     * @param present_complete_semaphore 推送完成信号
+        return rt_list[current_frame]->Submit(present_complete_semaphore);
-     */
+    }
-    int AcquireNextImage();
-
-    /**
-     * 推送后台画面到前台
-     * @param render_complete_semaphore 渲染完成信号
-     */
-    bool PresentBackbuffer(VkSemaphore *wait_semaphores,const uint32_t wait_semaphore_count);
-
-    bool PresentBackbuffer();
-
-    bool Submit(VkCommandBuffer);
-    bool Submit(VkCommandBuffer,Semaphore *);
 };//class RTSwapchain:public RenderTarget
 VK_NAMESPACE_END
-#endif//HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE

inc/hgl/graph/VKSwapchain.h

@@ -1,10 +1,32 @@
-#ifndef HGL_GRAPH_VULKAN_SWAP_CHAIN_INCLUDE
+#pragma once
-#define HGL_GRAPH_VULKAN_SWAP_CHAIN_INCLUDE
 
 #include<hgl/graph/VK.h>
 #include<hgl/graph/VKTexture.h>
 #include<hgl/type/List.h>
+#include<hgl/graph/VKFramebuffer.h>
+#include<hgl/graph/VKCommandBuffer.h>
 VK_NAMESPACE_BEGIN
+
+struct SwapchainImage
+{
+    Texture2D *                    color            =nullptr;
+    Texture2D *                    depth            =nullptr;
+
+    Framebuffer *                  fbo              =nullptr;
+
+    RenderCmdBuffer *              cmd_buf          =nullptr;
+
+public:
+
+    ~SwapchainImage()
+    {
+        delete cmd_buf;
+        delete fbo;
+        delete depth;
+        delete color;
+    }
+};//struct SwapchainImage
+
 struct Swapchain
 {
 public:
@@ -12,19 +34,20 @@ public:
     VkDevice                        device          =VK_NULL_HANDLE;
     
     VkExtent2D                      extent;
+    VkSurfaceTransformFlagBitsKHR   transform;
 
     VkSwapchainKHR                  swap_chain      =VK_NULL_HANDLE;
+    VkSurfaceFormatKHR              surface_format;
+    VkFormat                        depth_format;
 
-    uint32_t                color_count     =0;
+    RenderPass *                    render_pass     =nullptr;
 
-    Texture2D **            sc_color        =nullptr;
+    uint32_t                        image_count     =0;
-    Texture2D *             sc_depth        =nullptr;
 
-    Framebuffer **          sc_fbo          =nullptr;
+    SwapchainImage *                sc_image        =nullptr;
 
 public:
 
     virtual ~Swapchain();
 };//struct Swapchain
 VK_NAMESPACE_END
-#endif//HGL_GRAPH_VULKAN_SWAP_CHAIN_INCLUDE

src/SceneGraph/InlineGeometry.cpp

@@ -267,7 +267,7 @@ namespace hgl
                 uint vertex_count;
                 uint index_count;
 
-                vertex_count=cci->field_count;
+                vertex_count=cci->field_count+1;
                 index_count=(vertex_count-2)*3;
 
                 if(!pc->Init("Circle",vertex_count,index_count))return(nullptr);

src/SceneGraph/Vulkan/Debug/VKPhysicalDeviceCapsOutput.cpp

@@ -169,6 +169,35 @@ namespace
     #undef OUTPUT_PHYSICAL_DEVICE_FEATURE
     }
 
+    void DebugOut(const VkPhysicalDeviceVulkan14Features &features)
+    {
+        std::cout<<"Vulkan 1.4 features"<<std::endl;
+
+    #define OUTPUT_PHYSICAL_DEVICE_FEATURE(name)    std::cout<<std::setw(60)<<std::right<<#name<<": "<<(features.name?"true":"false")<<std::endl;
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(globalPriorityQuery)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(shaderSubgroupRotate)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(shaderSubgroupRotateClustered)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(shaderFloatControls2)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(shaderExpectAssume)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(rectangularLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(bresenhamLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(smoothLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(stippledRectangularLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(stippledBresenhamLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(stippledSmoothLines)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(vertexAttributeInstanceRateDivisor)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(vertexAttributeInstanceRateZeroDivisor)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(indexTypeUint8)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(dynamicRenderingLocalRead)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(maintenance5)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(maintenance6)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(pipelineProtectedAccess)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(pipelineRobustness)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(hostImageCopy)
+        OUTPUT_PHYSICAL_DEVICE_FEATURE(pushDescriptor)
+    #undef OUTPUT_PHYSICAL_DEVICE_FEATURE
+    }
+
     void DebugOutVersion(uint32_t version)
     {
         std::cout<<VK_VERSION_MAJOR(version)<<"."<<VK_VERSION_MINOR(version)<<"."<<VK_VERSION_PATCH(version)<<std::endl;
@@ -377,5 +406,6 @@ void OutputPhysicalDeviceCaps(const GPUPhysicalDevice *pd)
     DebugOut(pd->GetFeatures11());
     DebugOut(pd->GetFeatures12());
     DebugOut(pd->GetFeatures13());
+    DebugOut(pd->GetFeatures14());
 }
 VK_NAMESPACE_END

src/SceneGraph/Vulkan/VKCommandBufferRender.cpp

@@ -5,6 +5,7 @@
 #include<hgl/graph/VKDeviceAttribute.h>
 #include<hgl/graph/VKPhysicalDevice.h>
 #include<hgl/graph/VKIndexBuffer.h>
+#include<hgl/graph/VKRenderTarget.h>
 
 VK_NAMESPACE_BEGIN
 RenderCmdBuffer::RenderCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb)
@@ -15,7 +16,6 @@ RenderCmdBuffer::RenderCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer
     hgl_zero(render_area);
     hgl_zero(viewport);
 
-    fbo=nullptr;
     pipeline_layout=VK_NULL_HANDLE;
 }
 
@@ -25,13 +25,8 @@ RenderCmdBuffer::~RenderCmdBuffer()
         hgl_free(clear_values);
 }
 
-void RenderCmdBuffer::SetFBO(Framebuffer *fb)
+void RenderCmdBuffer::SetClear()
 {
-    if(fbo==fb)return;
-
-    fbo=fb;
-    cv_count=fbo->GetAttachmentCount();
-
     if(cv_count>0)
     {
         clear_values=hgl_align_realloc<VkClearValue>(clear_values,cv_count);
@@ -44,11 +39,6 @@ void RenderCmdBuffer::SetFBO(Framebuffer *fb)
         hgl_free(clear_values);
         clear_values=nullptr;
     }
-
-    render_area.offset.x=0;
-    render_area.offset.y=0;
-    render_area.extent.width=0;
-    render_area.extent.height=0;
 }
 
 void RenderCmdBuffer::SetRenderArea(const VkExtent2D &ext2d)
@@ -58,18 +48,19 @@ void RenderCmdBuffer::SetRenderArea(const VkExtent2D &ext2d)
     render_area.extent=ext2d;
 }
 
-bool RenderCmdBuffer::BindFramebuffer(RenderPass *rp,Framebuffer *fb)
+bool RenderCmdBuffer::BindFramebuffer(Framebuffer *fbo)
 {
-    if(!rp||!fb)return(false);
+    if(!fbo)return(false);
 
-    SetFBO(fb);
+    cv_count=fbo->GetAttachmentCount();
+    SetClear();
 
     render_area.offset.x=0;
     render_area.offset.y=0;
-    render_area.extent=fb->GetExtent();
+    render_area.extent=fbo->GetExtent();
 
-    rp_begin.renderPass         = rp->GetVkRenderPass();
+    rp_begin.renderPass         = *fbo->GetRenderPass();
-    rp_begin.framebuffer        = *fb;
+    rp_begin.framebuffer        = *fbo;
     rp_begin.renderArea         = render_area;
     rp_begin.clearValueCount    = cv_count;
     rp_begin.pClearValues       = clear_values;

src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp

@@ -75,7 +75,7 @@ Framebuffer *GPUDevice::CreateFBO(RenderPass *rp,ImageView **color_list,const ui
     if(!fbo)
         return(nullptr);
 
-    return(new Framebuffer(GetDevice(),fbo,extent,rp->GetVkRenderPass(),color_count,depth));
+    return(new Framebuffer(GetDevice(),fbo,extent,rp,color_count,depth));
 }
 //
 //Framebuffer *GPUDevice::CreateFBO(RenderPass *rp,List<ImageView *> &color,ImageView *depth)

src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp

@@ -7,15 +7,6 @@ VK_NAMESPACE_BEGIN
 void GPUDevice::InitRenderPassManage()
 {
     render_pass_manage=new DeviceRenderPassManage(attr->device,attr->pipeline_cache);
-    
-    SwapchainRenderbufferInfo rbi(attr->surface_format.format,attr->physical_device->GetDepthFormat());
-
-    device_render_pass=render_pass_manage->AcquireRenderPass(&rbi);
-
-    #ifdef _DEBUG
-        if(attr->debug_utils)
-            attr->debug_utils->SetRenderPass(device_render_pass->GetVkRenderPass(),"MainDeviceRenderPass");
-    #endif//_DEBUG
 }
 
 void GPUDevice::ClearRenderPassManage()

src/SceneGraph/Vulkan/VKDeviceRenderTarget.cpp

@@ -1,4 +1,6 @@
 #include<hgl/graph/VKDevice.h>
+#include<hgl/graph/VKDeviceRenderPassManage.h>
+#include<hgl/graph/VKSemaphore.h>
 
 VK_NAMESPACE_BEGIN
 RenderTarget *GPUDevice::CreateRT(const FramebufferInfo *fbi,RenderPass *rp,const uint32_t fence_count)
@@ -33,13 +35,21 @@ RenderTarget *GPUDevice::CreateRT(const FramebufferInfo *fbi,RenderPass *rp,cons
 
     if(fb)
     {
-        DeviceQueue *q=CreateQueue(fence_count,false);
+        RenderTargetData *rtd=new RenderTargetData{};
-        Semaphore *render_complete_semaphore=CreateGPUSemaphore();
 
-        RenderTarget *rt=new RenderTarget(q,render_complete_semaphore,rp,fb,color_texture_list,color_count,depth_texture);
+        rtd->fbo                        =fb;
+        rtd->queue                      =CreateQueue(fence_count,false);
+        rtd->render_complete_semaphore  =CreateGPUSemaphore();
+
+        rtd->cmd_buf                    =CreateRenderCommandBuffer("");
+
+        rtd->color_count                =color_count;
+        rtd->color_textures             =hgl_new_copy<Texture2D *>(color_texture_list,color_count);
+        rtd->depth_texture              =depth_texture;
 
         color_texture_list.DiscardObject();
-        return rt;
+
+        return(new RenderTarget(rtd));
     }
 
     SAFE_CLEAR(depth_texture);
@@ -57,23 +67,55 @@ RenderTarget *GPUDevice::CreateRT(const FramebufferInfo *fbi,const uint32_t fenc
     return CreateRT(fbi,rp,fence_count);
 }
 
-RTSwapchain *GPUDevice::CreateSwapchainRenderTarget()
+namespace
+{
+    struct SwapchainRenderTargetData:public RenderTargetData
+    {
+        void Clear() override
+        {
+            delete render_complete_semaphore;
+            delete queue;
+
+            delete[] color_textures;
+        }
+    };//
+}//namespace
+
+SwapchainRenderTarget *GPUDevice::CreateSwapchainRenderTarget()
 {
     Swapchain *sc=CreateSwapchain(attr->surface_caps.currentExtent);
 
     if(!sc)
         return(nullptr);
 
-    DeviceQueue *q=CreateQueue(sc->color_count,false);
+    RenderTarget **rt_list=new RenderTarget*[sc->image_count];
-    Semaphore *render_complete_semaphore=CreateGPUSemaphore();
-    Semaphore *present_complete_semaphore=CreateGPUSemaphore();
 
-    RTSwapchain *srt=new RTSwapchain(   attr->device,
+    SwapchainImage *sc_image=sc->sc_image;
+
+    for(uint32_t i=0;i<sc->image_count;i++)
+    {
+        RenderTargetData *rtd=new SwapchainRenderTargetData{};
+
+        rtd->fbo                        =sc_image->fbo;
+        rtd->queue                      =CreateQueue(sc->image_count,false);
+        rtd->render_complete_semaphore  =CreateGPUSemaphore();
+
+        rtd->cmd_buf                    =sc_image->cmd_buf;
+
+        rtd->color_count                =1;
+        rtd->color_textures             =new Texture2D*[1];
+        rtd->color_textures[0]          =sc_image->color;
+        rtd->depth_texture              =sc_image->depth;
+
+        rt_list[i]=new RenderTarget(rtd);
+
+        ++sc_image;
+    }
+
+    SwapchainRenderTarget *srt=new SwapchainRenderTarget(   attr->device,
                                                             sc,
-                                        q,
+                                                            CreateGPUSemaphore(),
-                                        render_complete_semaphore,
+                                                            rt_list
-                                        present_complete_semaphore,
-                                        device_render_pass
                                                             );
 
     return srt;

src/SceneGraph/Vulkan/VKDeviceSwapchain.cpp

@@ -1,6 +1,7 @@
 #include<hgl/graph/VKDevice.h>
 #include<hgl/graph/VKDeviceAttribute.h>
 #include<hgl/graph/VKPhysicalDevice.h>
+#include<hgl/graph/VKDeviceRenderPassManage.h>
 #include<iostream>
 
 VK_NAMESPACE_BEGIN
@@ -84,49 +85,47 @@ namespace
 
 bool GPUDevice::CreateSwapchainFBO(Swapchain *swapchain)
 {
-    if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->color_count),nullptr)!=VK_SUCCESS)
+    if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->image_count),nullptr)!=VK_SUCCESS)
         return(false);
 
-    AutoDeleteArray<VkImage> sc_images(swapchain->color_count);
+    AutoDeleteArray<VkImage> sc_images(swapchain->image_count);
 
-    if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->color_count),sc_images)!=VK_SUCCESS)
+    if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->image_count),sc_images)!=VK_SUCCESS)
         return(false);
 
-    swapchain->sc_depth =CreateTexture2D(new SwapchainDepthTextureCreateInfo(attr->physical_device->GetDepthFormat(),swapchain->extent));
+    swapchain->sc_image=hgl_zero_new<SwapchainImage>(swapchain->image_count);
 
-    if(!swapchain->sc_depth)
+    AnsiString num_string;
+
+    for(uint32_t i=0;i<swapchain->image_count;i++)
+    {
+        swapchain->sc_image[i].color=CreateTexture2D(new SwapchainColorTextureCreateInfo(swapchain->surface_format.format,swapchain->extent,sc_images[i]));
+
+        if(!swapchain->sc_image[i].color)
             return(false);
 
+        swapchain->sc_image[i].depth=CreateTexture2D(new SwapchainDepthTextureCreateInfo(swapchain->depth_format,swapchain->extent));
+
+        if(!swapchain->sc_image[i].depth)
+            return(false);
+
+        swapchain->sc_image[i].fbo=CreateFBO(   swapchain->render_pass,
+                                                swapchain->sc_image[i].color->GetImageView(),
+                                                swapchain->sc_image[i].depth->GetImageView());
+
+        AnsiString num_string=AnsiString::numberOf(i);
+
+        swapchain->sc_image[i].cmd_buf=CreateRenderCommandBuffer(AnsiString("Swapchain_RenderCmdBuffer_")+num_string);
+
     #ifdef _DEBUG
         if(attr->debug_utils)
         {
-            attr->debug_utils->SetImage(swapchain->sc_depth->GetImage(),"SwapchainDepthImage");
+            AnsiString num=AnsiString::numberOf(i);
-            attr->debug_utils->SetImageView(swapchain->sc_depth->GetVulkanImageView(),"SwapchainDepthImageView");
-            attr->debug_utils->SetDeviceMemory(swapchain->sc_depth->GetDeviceMemory(),"SwapchainDepthMemory");
-        }
-    #endif//_DEBUG
 
-    swapchain->sc_color =hgl_zero_new<Texture2D *>(swapchain->color_count);
+            attr->debug_utils->SetTexture(swapchain->sc_image[i].color,"SwapchainColor_"+num_string);
-    swapchain->sc_fbo   =hgl_zero_new<Framebuffer *>(swapchain->color_count);
+            attr->debug_utils->SetTexture(swapchain->sc_image[i].depth,"SwapchainDepth_"+num_string);
 
-    for(uint32_t i=0;i<swapchain->color_count;i++)
+            attr->debug_utils->SetFramebuffer(swapchain->sc_image[i].fbo->GetFramebuffer(),"SwapchainFBO_"+num_string);
-    {
-        swapchain->sc_color[i]=CreateTexture2D(new SwapchainColorTextureCreateInfo(attr->surface_format.format,swapchain->extent,sc_images[i]));
-
-        if(!swapchain->sc_color[i])
-            return(false);
-
-        swapchain->sc_fbo[i]=CreateFBO( device_render_pass,
-                                        swapchain->sc_color[i]->GetImageView(),
-                                        swapchain->sc_depth->GetImageView());
-
-    #ifdef _DEBUG
-        if(attr->debug_utils)
-        {
-            attr->debug_utils->SetImage(swapchain->sc_color[i]->GetImage(),"SwapchainColorImage_"+AnsiString::numberOf(i));
-            attr->debug_utils->SetImageView(swapchain->sc_color[i]->GetVulkanImageView(),"SwapchainColorImageView_"+AnsiString::numberOf(i));
-
-            attr->debug_utils->SetFramebuffer(swapchain->sc_fbo[i]->GetFramebuffer(),"SwapchainFBO_"+AnsiString::numberOf(i));
         }
     #endif//_DEBUG
     }
@@ -140,6 +139,18 @@ Swapchain *GPUDevice::CreateSwapchain(const VkExtent2D &acquire_extent)
 
     swapchain->device           =attr->device;
     swapchain->extent           =acquire_extent;
+    swapchain->transform        =attr->surface_caps.currentTransform;
+    swapchain->surface_format   =attr->surface_format;
+    swapchain->depth_format     =attr->physical_device->GetDepthFormat();
+    
+    SwapchainRenderbufferInfo rbi(swapchain->surface_format.format,swapchain->depth_format);
+
+    swapchain->render_pass      =render_pass_manage->AcquireRenderPass(&rbi);
+
+    #ifdef _DEBUG
+        if(attr->debug_utils)
+            attr->debug_utils->SetRenderPass(swapchain->render_pass->GetVkRenderPass(),"MainDeviceRenderPass");
+    #endif//_DEBUG
 
     swapchain->swap_chain       =CreateSwapChain(attr,acquire_extent);
 

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;

src/SceneGraph/Vulkan/VKInstance.cpp

@@ -20,7 +20,7 @@ VulkanInstance *CreateInstance(const AnsiString &app_name,VKDebugOut *out,Create
     app_info.applicationVersion = 1;
     app_info.pEngineName        = "CMGameEngine/ULRE";
     app_info.engineVersion      = 1;
-    app_info.apiVersion         = VK_API_VERSION_1_3;
+    app_info.apiVersion         = VK_API_VERSION_1_4;
 
     ext_list.Add(VK_KHR_SURFACE_EXTENSION_NAME);
     ext_list.Add(HGL_VK_SURFACE_EXTENSION_NAME);            //此宏在VKSurfaceExtensionName.h中定义

src/SceneGraph/Vulkan/VKPhysicalDevice.cpp

@@ -64,6 +64,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
         hgl_zero(features11);
         hgl_zero(features12);
         hgl_zero(features13);
+        hgl_zero(features14);
 
         auto func=(PFN_vkGetPhysicalDeviceFeatures2KHR)vkGetInstanceProcAddr(inst,"vkGetPhysicalDeviceFeatures2KHR");
 
@@ -81,7 +82,10 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
             features12.pNext=&features13;
 
             features13.sType=VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES;
-            features13.pNext=nullptr;
+            features13.pNext=&features14;
+
+            features14.sType=VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES;
+            features14.pNext=nullptr;
 
             func(physical_device,&features2);
 
@@ -97,6 +101,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
         hgl_zero(properties11);
         hgl_zero(properties12);
         hgl_zero(properties13);
+        hgl_zero(properties14);
 
         auto func=(PFN_vkGetPhysicalDeviceProperties2KHR)vkGetInstanceProcAddr(inst,"vkGetPhysicalDeviceProperties2KHR");
 
@@ -114,7 +119,10 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
             properties12.pNext=&properties13;
 
             properties13.sType=VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
-            properties13.pNext=nullptr;
+            properties13.pNext=&properties14;
+
+            properties14.sType=VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES;
+            properties14.pNext=nullptr;
 
             func(physical_device,&properties2);
 
@@ -163,7 +171,11 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
         debug_queue_family_properties_out(debug_front.c_str(),queue_family_properties);
     }
 
+    if(features14.indexTypeUint8)
+        support_u8_index=true;
+    else
         support_u8_index=CheckExtensionSupport(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME);
+
     dynamic_state=CheckExtensionSupport(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
 }
 

src/SceneGraph/Vulkan/VKRenderTarget.cpp

@@ -1,66 +1,17 @@
 #include<hgl/graph/VKRenderTarget.h>
 #include<hgl/graph/VKDevice.h>
-#include<hgl/graph/VKSwapchain.h>
-#include<hgl/graph/VKCommandBuffer.h>
 #include<hgl/graph/VKSemaphore.h>
 #include<hgl/graph/VKFramebuffer.h>
 
 VK_NAMESPACE_BEGIN
-RenderTarget::RenderTarget(DeviceQueue *q,Semaphore *s)
-{
-    queue=q;
-    render_pass=nullptr;
-    fbo=nullptr;
 
-    color_count=0;
+void RenderTargetData::Clear()
-    color_textures=nullptr;
-    depth_texture=nullptr;
-    render_complete_semaphore=s;
-}
-
-RenderTarget::RenderTarget(DeviceQueue *q,Semaphore *s,RenderPass *_rp,Framebuffer *_fb,Texture2D **ctl,const uint32_t cc,Texture2D *dt)
-{
-    queue=q;
-    render_pass=_rp;
-    fbo=_fb;
-    
-    depth_texture=dt;
-
-    color_count=cc;
-    if(color_count>0)
-    {
-        color_textures=new Texture2D *[color_count];
-        hgl_cpy(color_textures,ctl,color_count);
-
-        extent.width=color_textures[0]->GetWidth();
-        extent.height=color_textures[0]->GetHeight();
-    }
-    else
-    {
-        color_textures=nullptr;
-
-        if(depth_texture)
-        {
-            extent.width=depth_texture->GetWidth();
-            extent.height=depth_texture->GetHeight();
-        }
-    }
-
-    render_complete_semaphore=s;
-}
-
-RenderTarget::~RenderTarget()
 {
     SAFE_CLEAR(queue);
-    SAFE_CLEAR(depth_texture);
-    SAFE_CLEAR_OBJECT_ARRAY_OBJECT(color_textures,color_count);
-    
     SAFE_CLEAR(render_complete_semaphore);
     SAFE_CLEAR(fbo);
+    SAFE_CLEAR_OBJECT_ARRAY_OBJECT(color_textures,color_count);
+    SAFE_CLEAR(depth_texture);
 }
 
-bool RenderTarget::Submit(RenderCmdBuffer *command_buffer,Semaphore *present_complete_semaphore)
-{
-    return queue->Submit(*command_buffer,present_complete_semaphore,render_complete_semaphore);
-}
 VK_NAMESPACE_END

src/SceneGraph/Vulkan/VKSwapchain.cpp

@@ -1,12 +1,11 @@
 #include<hgl/graph/VKSwapchain.h>
 #include<hgl/graph/VKFramebuffer.h>
+#include<hgl/graph/VKRenderPass.h>
 
 VK_NAMESPACE_BEGIN
 Swapchain::~Swapchain()
 {
-    SAFE_CLEAR_OBJECT_ARRAY_OBJECT(sc_fbo,color_count);
+    SAFE_CLEAR_ARRAY(sc_image);
-    SAFE_CLEAR(sc_depth);
-    SAFE_CLEAR_OBJECT_ARRAY_OBJECT(sc_color,color_count)
 
     if(swap_chain)
     {
@@ -14,6 +13,6 @@ Swapchain::~Swapchain()
         swap_chain=VK_NULL_HANDLE;
     }
 
-    color_count=0;
+    image_count=0;
 }
 VK_NAMESPACE_END

src/SceneGraph/Vulkan/VKSwapchainRenderTarget.cpp

@@ -3,7 +3,7 @@
 #include<hgl/graph/VKSemaphore.h>
 
 VK_NAMESPACE_BEGIN
-RTSwapchain::RTSwapchain(VkDevice dev,Swapchain *sc,DeviceQueue *q,Semaphore *rcs,Semaphore *pcs,RenderPass *rp):RenderTarget(q,rcs)
+SwapchainRenderTarget::SwapchainRenderTarget(VkDevice dev,Swapchain *sc,Semaphore *pcs,RenderTarget **rtl):MFRenderTarget(sc->image_count,rtl)
 {
     device=dev;
 
@@ -15,33 +15,36 @@ RTSwapchain::RTSwapchain(VkDevice dev,Swapchain *sc,DeviceQueue *q,Semaphore *rc
     present_info.pResults           = nullptr;
     present_info.pSwapchains        = &(swapchain->swap_chain);
    
-    render_pass=rp;
-   
-    extent=swapchain->extent;
-
-    current_frame=0;
-
     present_complete_semaphore=pcs;
 }
 
-RTSwapchain::~RTSwapchain()
+SwapchainRenderTarget::~SwapchainRenderTarget()
 {
     delete present_complete_semaphore;
     delete swapchain;
 }
     
-int RTSwapchain::AcquireNextImage()
+int SwapchainRenderTarget::AcquireNextImage()
 {
-    if(vkAcquireNextImageKHR(device,swapchain->swap_chain,UINT64_MAX,*(this->present_complete_semaphore),VK_NULL_HANDLE,&current_frame)==VK_SUCCESS)
+    if(vkAcquireNextImageKHR(device,
+                             swapchain->swap_chain,
+                             UINT64_MAX,
+                             *present_complete_semaphore,
+                             VK_NULL_HANDLE,
+                             &current_frame)==VK_SUCCESS)
         return current_frame;
 
     return -1;
 }
 
-bool RTSwapchain::PresentBackbuffer(VkSemaphore *wait_semaphores,const uint32_t count)
+bool SwapchainRenderTarget::PresentBackbuffer()
 {
-    present_info.waitSemaphoreCount =count;
+    DeviceQueue *queue=GetQueue();
-    present_info.pWaitSemaphores    =wait_semaphores;
+
+    VkSemaphore wait_semaphores=*GetRenderCompleteSemaphore();
+
+    present_info.waitSemaphoreCount =1;
+    present_info.pWaitSemaphores    =&wait_semaphores;
     present_info.pImageIndices      =&current_frame;
 
     VkResult result=queue->Present(&present_info);
@@ -57,21 +60,4 @@ bool RTSwapchain::PresentBackbuffer(VkSemaphore *wait_semaphores,const uint32_t
 
     return(true);
 }
-
-bool RTSwapchain::PresentBackbuffer()
-{
-    VkSemaphore sem=*render_complete_semaphore;
-
-    return this->PresentBackbuffer(&sem,1);
-}
-    
-bool RTSwapchain::Submit(VkCommandBuffer cb)
-{
-    return queue->Submit(cb,present_complete_semaphore,render_complete_semaphore);
-}
-
-bool RTSwapchain::Submit(VkCommandBuffer cb,Semaphore *pce)
-{
-    return queue->Submit(cb,pce,render_complete_semaphore);
-}
 VK_NAMESPACE_END