From 3bdf9bbb77f89e8178077c67492200849ba555ed Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Fri, 7 Jan 2022 16:26:40 +0800
Subject: [PATCH] Create a copy for PipelineData while CreatePipeline

---
 inc/hgl/graph/VKRenderPass.h           |  6 ++-
 src/SceneGraph/Vulkan/VKRenderPass.cpp | 56 ++++++++++++++++----------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/inc/hgl/graph/VKRenderPass.h b/inc/hgl/graph/VKRenderPass.h
index 7a15c894..4bc48f4e 100644
--- a/inc/hgl/graph/VKRenderPass.h
+++ b/inc/hgl/graph/VKRenderPass.h
@@ -25,6 +25,8 @@ protected:
 
     ObjectList<Pipeline> pipeline_list;
 
+    Pipeline *CreatePipeline(Material *,PipelineData *,const VAB *);
+
 private:
 
     friend class DeviceRenderPassManage;
@@ -52,13 +54,13 @@ public:
 
 public:
 
-    Pipeline *CreatePipeline(MaterialInstance *,        PipelineData *);
+    Pipeline *CreatePipeline(MaterialInstance *,  const PipelineData *);
     Pipeline *CreatePipeline(MaterialInstance *,  const InlinePipeline &);
 
 public:
 
     Pipeline *CreatePipeline(MaterialInstance *,  const InlinePipeline &,  const Prim &prim,const bool prim_restart=false);
-    Pipeline *CreatePipeline(MaterialInstance *,        PipelineData *,    const Prim &prim,const bool prim_restart=false);
+    Pipeline *CreatePipeline(MaterialInstance *,  const PipelineData *,    const Prim &prim,const bool prim_restart=false);
     Pipeline *CreatePipeline(MaterialInstance *,  const OSString &,        const Prim &prim,const bool prim_restart=false);
 };//class RenderPass
 VK_NAMESPACE_END
diff --git a/src/SceneGraph/Vulkan/VKRenderPass.cpp b/src/SceneGraph/Vulkan/VKRenderPass.cpp
index 7c27f0fe..f0e7895c 100644
--- a/src/SceneGraph/Vulkan/VKRenderPass.cpp
+++ b/src/SceneGraph/Vulkan/VKRenderPass.cpp
@@ -23,37 +23,47 @@ RenderPass::~RenderPass()
     vkDestroyRenderPass(device,render_pass,nullptr);
 }
 
-Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,PipelineData *data)
+Pipeline *RenderPass::CreatePipeline(Material *mtl,PipelineData *pd,const VAB *vab)
 {
     VkPipeline graphicsPipeline;
 
-    Material *mtl=mi->GetMaterial();
+    pd->InitShaderStage(mtl->GetStageList());
+    pd->InitVertexInputState(vab);
 
-    data->InitShaderStage(mtl->GetStageList());
-    data->InitVertexInputState(mi->GetVAB());
+    pd->SetColorAttachments(color_formats.GetCount());
 
-    data->SetColorAttachments(color_formats.GetCount());
-
-    data->pipeline_info.layout = mtl->GetPipelineLayout();
+    pd->pipeline_info.layout = mtl->GetPipelineLayout();
 
     {
-        data->pipeline_info.renderPass = render_pass;
-        data->pipeline_info.subpass = 0;                   //subpass由于还不知道有什么用，所以暂时写0，待知道功用后，需改进
+        pd->pipeline_info.renderPass = render_pass;
+        pd->pipeline_info.subpass = 0;                   //subpass由于还不知道有什么用，所以暂时写0，待知道功用后，需改进
     }
 
     if (vkCreateGraphicsPipelines(  device,
-                                    pipeline_cache,
-                                    1,&data->pipeline_info,
-                                    nullptr,
-                                    &graphicsPipeline) != VK_SUCCESS)
+        pipeline_cache,
+        1,&pd->pipeline_info,
+        nullptr,
+        &graphicsPipeline) != VK_SUCCESS)
+    {
+        delete pd;
         return(nullptr);
+    }
 
-    return(new Pipeline(device,graphicsPipeline,data));
+    return(new Pipeline(device,graphicsPipeline,pd));
+}
+
+Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const PipelineData *data)
+{
+    Material *mtl=mi->GetMaterial();
+
+    PipelineData *pd=new PipelineData(data);
+
+    return CreatePipeline(mtl,pd,mi->GetVAB());
 }
 
 Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const InlinePipeline &ip)
 {
-    PipelineData *pd=GetPipelineData(ip);
+    const PipelineData *pd=GetPipelineData(ip);
 
     if(!pd)return(nullptr);
 
@@ -64,11 +74,13 @@ Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const InlinePipeline &
 {
     if(!mi)return(nullptr);
 
-    PipelineData *pd=GetPipelineData(ip);
+    const PipelineData *cpd=GetPipelineData(ip);
+
+    PipelineData *pd=new PipelineData(cpd);
 
     pd->Set(prim,prim_restart);
 
-    Pipeline *p=CreatePipeline(mi,pd);
+    Pipeline *p=CreatePipeline(mi->GetMaterial(),pd,mi->GetVAB());
 
     if(p)
         pipeline_list.Add(p);
@@ -76,11 +88,13 @@ Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const InlinePipeline &
     return p;
 }
 
-Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,PipelineData *pd,const Prim &prim,const bool prim_restart)
+Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const PipelineData *cpd,const Prim &prim,const bool prim_restart)
 {
+    PipelineData *pd=new PipelineData(cpd);
+
     pd->Set(prim,prim_restart);
-    
-    Pipeline *p=CreatePipeline(mi,pd);
+
+    Pipeline *p=CreatePipeline(mi->GetMaterial(),pd,mi->GetVAB());
 
     if(p)
         pipeline_list.Add(p);
@@ -90,7 +104,7 @@ Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,PipelineData *pd,const
 
 Pipeline *RenderPass::CreatePipeline(MaterialInstance *mi,const OSString &pipeline_filename,const Prim &prim,const bool prim_restart)
 {
-    PipelineData *pd=GetPipelineData(pipeline_filename);
+    const PipelineData *pd=GetPipelineData(pipeline_filename);
 
     if(!pd)return(nullptr);